Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / prebuilts / abi-dumps / vndk / a7983444fa006f1d874b3ec30f50a9075f5f1081^! / .
commita7983444fa006f1d874b3ec30f50a9075f5f1081[log] [tgz]
authorJeff Tinker <jtinker@google.com>Tue May 07 13:53:47 2019 -0700
committerJeff Tinker <jtinker@google.com>Wed May 08 00:55:56 2019 +0000
tree9bf6d41230ef3414226929869094acc5283f0271
parentbaba55332638e84eff3f21c640b24758edec0df4 [diff]
create_reference_dumps for drm@1.2

Related to correcting key status when license
has a start time in the future

Test: vts-tradefed run commandAndExit -m VtsHalDrmV1_2Target

bug:116738851
Change-Id: Iaf3106a98f961a49927aaf22c659173c3a42d227

diff --git a/Q/32/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump
index 2c5bb82..11980d9 100644
--- a/Q/32/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-394",
+   "referenced_type" : "type-57",
+   "self_type" : "type-397",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-57",
+   "self_type" : "type-1320",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-807",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1388",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-41",
-   "self_type" : "type-166",
+   "referenced_type" : "type-27",
+   "self_type" : "type-171",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1045",
+   "self_type" : "type-1086",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-90",
-   "self_type" : "type-977",
+   "self_type" : "type-1011",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-391",
+   "self_type" : "type-394",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1307",
+   "self_type" : "type-1380",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1
   },
   {
@@ -79,8 +88,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1
   },
   {
@@ -89,8 +98,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -105,8 +114,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 4
   },
   {
@@ -114,8 +123,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -123,16 +132,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 2
   },
   {
@@ -158,8 +167,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-864",
+   "self_type" : "type-864",
    "size" : 1
   },
   {
@@ -188,8 +197,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4
   },
   {
@@ -208,15 +217,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -360,6 +369,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -483,6 +495,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -534,6 +549,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -1002,6 +1020,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1041,6 +1062,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1056,6 +1080,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1074,6 +1101,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1637,8 +1670,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1327",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1655,8 +1688,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1673,8 +1706,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1699,11 +1732,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1729,11 +1762,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1751,8 +1784,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1777,11 +1810,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1831,11 +1864,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1885,8 +1918,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1907,8 +1940,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1941,8 +1974,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1971,8 +2004,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2005,8 +2038,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2031,8 +2064,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2061,8 +2094,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2127,8 +2160,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2271,8 +2304,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2330,6 +2363,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2451,11 +2522,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1112",
    "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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2469,11 +2540,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2495,8 +2566,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "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-90",
@@ -2599,8 +2670,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2625,8 +2696,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2667,8 +2738,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2909,8 +2980,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-1292",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2939,8 +3010,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2969,8 +3040,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3011,8 +3082,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3049,8 +3120,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3075,8 +3146,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3093,8 +3164,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3123,8 +3194,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3217,8 +3288,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3259,8 +3330,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3277,8 +3348,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3307,8 +3378,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3341,8 +3412,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3395,8 +3466,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3412,18 +3483,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
-    },
-    {
-     "referenced_type" : "type-62"
-    },
-    {
      "referenced_type" : "type-42"
+    },
+    {
+     "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-41",
+   "return_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3433,12 +3504,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1319",
-   "return_type" : "type-41",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1392",
+   "return_type" : "type-27",
+   "self_type" : "type-1392",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3448,27 +3519,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1083"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1198"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1162",
-   "return_type" : "type-43",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1196",
+   "return_type" : "type-29",
+   "self_type" : "type-1196",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3481,14 +3552,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3498,16 +3569,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3517,13 +3588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1532"
+     "referenced_type" : "type-1605"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3533,13 +3604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1533"
+     "referenced_type" : "type-1606"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3549,14 +3620,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3566,13 +3637,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3582,13 +3653,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1534"
+     "referenced_type" : "type-1607"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3598,14 +3669,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3615,13 +3686,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1535"
+     "referenced_type" : "type-1608"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3631,10 +3702,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3644,10 +3715,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3656,13 +3727,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3672,10 +3743,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3685,16 +3756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3703,14 +3774,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3719,14 +3790,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3735,14 +3806,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3751,14 +3822,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3769,13 +3840,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-1540"
+     "referenced_type" : "type-1613"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3785,13 +3856,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3801,13 +3872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3817,14 +3888,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3834,16 +3905,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3853,13 +3924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1568"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3869,13 +3940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1569"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3885,14 +3956,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3902,13 +3973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3918,13 +3989,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-1643"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3934,14 +4005,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3951,13 +4022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-1644"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3967,10 +4038,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3980,10 +4051,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3992,13 +4063,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4008,10 +4079,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4021,16 +4092,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4039,14 +4110,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-234"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4055,14 +4126,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-240"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4071,14 +4142,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4087,14 +4158,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4105,13 +4176,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-1575"
+     "referenced_type" : "type-1648"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4121,13 +4192,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4137,13 +4208,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4153,16 +4224,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -4170,10 +4241,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1578"
+     "referenced_type" : "type-1651"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4184,13 +4255,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-1652"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4199,19 +4270,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1580"
+     "referenced_type" : "type-1653"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4220,19 +4291,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1581"
+     "referenced_type" : "type-1654"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1207"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-1655"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4241,19 +4333,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1582"
+     "referenced_type" : "type-1656"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4262,19 +4354,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1583"
+     "referenced_type" : "type-1657"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4283,19 +4375,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1584"
+     "referenced_type" : "type-1658"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4304,19 +4396,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1659"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4325,19 +4417,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1660"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4348,10 +4440,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4361,13 +4453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4377,13 +4469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4393,10 +4485,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4406,10 +4498,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4419,10 +4511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4432,13 +4524,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-1661"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4448,13 +4540,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4464,16 +4556,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4483,13 +4575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4499,16 +4591,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4518,13 +4610,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4534,13 +4626,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4550,13 +4642,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4566,13 +4658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1590"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4582,13 +4674,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4598,28 +4690,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4629,16 +4721,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4648,13 +4740,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4664,13 +4756,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4680,13 +4772,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4696,16 +4788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4715,19 +4807,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4737,16 +4829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1597"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4756,16 +4848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4775,13 +4867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1598"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4791,16 +4883,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1599"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4810,13 +4902,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4826,13 +4918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4842,28 +4934,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1675"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4873,28 +4965,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1676"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4904,16 +4996,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1677"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4923,13 +5015,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4939,16 +5031,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4958,19 +5050,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1678"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4980,13 +5072,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-598"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-425"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4996,16 +5110,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5015,13 +5129,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1679"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5031,19 +5145,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1680"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5053,13 +5167,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1681"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5069,16 +5183,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1682"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5088,10 +5202,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5101,13 +5215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5117,16 +5231,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5136,13 +5250,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5152,16 +5266,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5171,10 +5285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5184,10 +5298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5197,10 +5311,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5210,16 +5324,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1683"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5228,16 +5342,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5246,31 +5360,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5280,19 +5394,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1539"
+    },
+    {
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5302,16 +5440,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5320,16 +5458,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5338,16 +5476,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5357,13 +5495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5372,19 +5510,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5393,22 +5531,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5417,16 +5555,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1691"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5436,10 +5574,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5449,22 +5587,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1692"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5474,16 +5612,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5493,25 +5631,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1693"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5521,25 +5659,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1694"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5549,25 +5687,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1695"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5577,25 +5715,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1622"
+     "referenced_type" : "type-1696"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5605,19 +5743,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1426"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5627,13 +5765,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5643,13 +5781,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5659,14 +5797,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5676,16 +5814,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5695,13 +5833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1623"
+     "referenced_type" : "type-1697"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5711,13 +5849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1698"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5727,14 +5865,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5744,13 +5882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5760,13 +5898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1699"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5776,14 +5914,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5793,13 +5931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1626"
+     "referenced_type" : "type-1700"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5809,10 +5947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5822,10 +5960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5834,13 +5972,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5850,10 +5988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5863,16 +6001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5881,14 +6019,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1517"
+     "referenced_type" : "type-1588"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5897,14 +6035,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5913,14 +6051,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5930,16 +6068,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -5947,10 +6085,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1627"
+     "referenced_type" : "type-1701"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5961,13 +6099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-1628"
+     "referenced_type" : "type-1702"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5976,19 +6114,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5999,10 +6137,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6012,13 +6150,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6028,13 +6166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6044,10 +6182,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6057,10 +6195,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6070,10 +6208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6083,16 +6221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6102,19 +6240,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6124,13 +6262,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6140,13 +6278,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6156,13 +6294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6172,13 +6310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6188,13 +6326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6204,10 +6342,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6217,10 +6355,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6230,13 +6368,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6246,13 +6384,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6262,19 +6400,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6283,22 +6421,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6308,10 +6446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6321,16 +6459,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6340,13 +6478,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6356,13 +6494,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6373,13 +6511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6389,13 +6527,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6405,13 +6543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6421,14 +6559,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6438,16 +6576,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6457,13 +6595,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6473,13 +6611,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1717"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6489,14 +6627,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6506,13 +6644,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6522,13 +6660,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6538,14 +6676,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6555,13 +6693,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1719"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6571,10 +6709,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6584,10 +6722,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6596,13 +6734,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6612,10 +6750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6625,16 +6763,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6647,10 +6785,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6659,14 +6797,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6675,14 +6813,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6691,14 +6829,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6709,13 +6847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1723"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6725,13 +6863,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6741,13 +6879,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6757,16 +6895,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -6774,10 +6912,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1726"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6788,13 +6926,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1727"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6803,19 +6941,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-1728"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6826,10 +6964,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6839,13 +6977,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6855,13 +6993,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6871,10 +7009,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6884,10 +7022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6897,10 +7035,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6910,40 +7048,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1655"
+     "referenced_type" : "type-1729"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6953,16 +7091,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6972,13 +7110,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1656"
+     "referenced_type" : "type-1730"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6988,13 +7126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1731"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7004,13 +7142,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7020,13 +7158,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1732"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7036,7 +7174,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
      "referenced_type" : "type-2"
@@ -7045,7 +7183,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7054,43 +7192,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1733"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7100,13 +7238,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7116,13 +7254,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1734"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7132,16 +7270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-939"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7151,10 +7289,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7164,10 +7302,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7177,13 +7315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7193,10 +7331,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7206,16 +7344,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-1535"
+    },
+    {
+     "referenced_type" : "type-1100"
+    },
+    {
      "referenced_type" : "type-1461"
-    },
-    {
-     "referenced_type" : "type-1068"
-    },
-    {
-     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7225,40 +7363,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1735"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7268,13 +7406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7284,13 +7422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7300,16 +7438,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -7317,10 +7455,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1736"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7331,13 +7469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1737"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7348,10 +7486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7361,13 +7499,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7377,13 +7515,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7393,10 +7531,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7406,10 +7544,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7419,10 +7557,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7432,16 +7570,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7451,19 +7589,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1738"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7473,13 +7611,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1739"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7489,13 +7627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1740"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7505,13 +7643,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7521,13 +7659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1741"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7537,13 +7675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7553,10 +7691,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7566,10 +7704,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7579,13 +7717,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7595,10 +7733,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7608,16 +7746,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7627,13 +7765,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7643,13 +7781,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7659,14 +7797,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7676,16 +7814,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7695,13 +7833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1669"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7711,13 +7849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1670"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7727,14 +7865,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7744,13 +7882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7760,13 +7898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7776,14 +7914,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7793,13 +7931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1672"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7809,10 +7947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7822,10 +7960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7834,13 +7972,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7850,10 +7988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7863,16 +8001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7881,14 +8019,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7897,14 +8035,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7913,14 +8051,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7931,13 +8069,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-1675"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7947,13 +8085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7963,13 +8101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7979,16 +8117,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -7996,10 +8134,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8010,13 +8148,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1207"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-1754"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8025,19 +8184,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1755"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8048,10 +8207,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8061,13 +8220,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8077,13 +8236,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8093,10 +8252,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8106,10 +8265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8119,10 +8278,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8132,16 +8291,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8151,13 +8310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1756"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8167,13 +8326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1757"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8183,13 +8342,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8199,13 +8358,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1758"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8215,19 +8374,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8237,13 +8418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1759"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8253,16 +8434,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8272,13 +8453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8288,10 +8469,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8301,10 +8482,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1539"
+    },
+    {
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8313,16 +8518,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8332,10 +8537,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8345,16 +8550,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8364,19 +8569,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1426"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8386,13 +8591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8402,33 +8607,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-210", "type-404" ]
+   "template_args" : [ "type-409", "type-215", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8436,18 +8683,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-404" ]
+   "template_args" : [ "type-409", "type-410", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8455,18 +8702,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-404" ]
+   "template_args" : [ "type-409", "type-5", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8474,18 +8721,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-190", "type-202" ]
+   "template_args" : [ "type-193", "type-195", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8493,18 +8740,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-189", "type-202" ]
+   "template_args" : [ "type-193", "type-194", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8512,18 +8759,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-5", "type-202" ]
+   "template_args" : [ "type-193", "type-5", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8531,18 +8778,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-133", "type-138" ]
+   "template_args" : [ "type-139", "type-140", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8550,18 +8797,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-5", "type-138" ]
+   "template_args" : [ "type-139", "type-5", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8569,18 +8816,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-413", "type-1419" ]
+   "template_args" : [ "type-461", "type-417", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8588,18 +8835,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-439", "type-1419" ]
+   "template_args" : [ "type-461", "type-444", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8607,18 +8854,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-5", "type-1419" ]
+   "template_args" : [ "type-461", "type-5", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8626,18 +8873,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-214", "type-602" ]
+   "template_args" : [ "type-623", "type-219", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8645,18 +8892,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-5", "type-602" ]
+   "template_args" : [ "type-623", "type-5", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8664,12 +8911,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
-   "return_type" : "type-208",
+   "return_type" : "type-213",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-210", "type-43" ]
+   "template_args" : [ "type-215", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8677,12 +8924,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-375",
+   "return_type" : "type-372",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-133", "type-43" ]
+   "template_args" : [ "type-140", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8690,12 +8937,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
-   "return_type" : "type-212",
+   "return_type" : "type-217",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-214", "type-43" ]
+   "template_args" : [ "type-219", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8703,18 +8950,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-404", "type-384", "type-43", "type-43" ]
+   "template_args" : [ "type-421", "type-409", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8722,18 +8969,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-188", "type-43", "type-43" ]
+   "template_args" : [ "type-207", "type-193", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8741,18 +8988,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-138", "type-132", "type-43", "type-43" ]
+   "template_args" : [ "type-143", "type-139", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8760,18 +9007,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1419", "type-462", "type-43", "type-43" ]
+   "template_args" : [ "type-1493", "type-461", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8779,18 +9026,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-602", "type-593", "type-43", "type-43" ]
+   "template_args" : [ "type-632", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8798,31 +9045,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8832,8 +9079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8841,8 +9088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8850,8 +9097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1151",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8859,8 +9106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8868,8 +9115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1550",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8877,8 +9124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-584",
-   "self_type" : "type-589",
+   "referenced_type" : "type-603",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8886,8 +9133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8895,8 +9142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-241",
-   "self_type" : "type-247",
+   "referenced_type" : "type-246",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8904,8 +9151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8913,8 +9160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-617",
-   "self_type" : "type-621",
+   "referenced_type" : "type-648",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8922,8 +9169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-561",
-   "self_type" : "type-580",
+   "referenced_type" : "type-552",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8931,8 +9178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-627",
+   "referenced_type" : "type-629",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8940,8 +9187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-243",
-   "self_type" : "type-550",
+   "referenced_type" : "type-248",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8949,8 +9196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8958,8 +9205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8967,8 +9214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8976,8 +9223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8985,8 +9232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8994,8 +9241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9003,8 +9250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9012,8 +9259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9021,8 +9268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9030,8 +9277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9039,8 +9286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9048,8 +9295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-936",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9057,8 +9304,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-697",
+   "referenced_type" : "type-483",
+   "self_type" : "type-751",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9066,8 +9322,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-973",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9075,8 +9331,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-954",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9084,8 +9340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-683",
+   "referenced_type" : "type-104",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9093,8 +9349,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-701",
+   "referenced_type" : "type-486",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-123",
+   "self_type" : "type-614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9102,8 +9367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-976",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9111,8 +9376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-937",
+   "referenced_type" : "type-929",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9121,7 +9386,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-80",
-   "self_type" : "type-1430",
+   "self_type" : "type-1503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9129,8 +9394,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-467",
-   "self_type" : "type-647",
+   "referenced_type" : "type-482",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9138,8 +9412,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-972",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9147,8 +9421,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-953",
-   "self_type" : "type-971",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9156,8 +9430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-645",
+   "referenced_type" : "type-103",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9165,8 +9439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-380",
+   "referenced_type" : "type-372",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9174,8 +9448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-220",
+   "referenced_type" : "type-213",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9183,8 +9457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-414",
+   "referenced_type" : "type-217",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9192,8 +9466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-460",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9201,8 +9475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9210,8 +9484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-239",
+   "referenced_type" : "type-191",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9219,8 +9493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-407",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9228,8 +9502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9237,8 +9511,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-490",
-   "self_type" : "type-501",
+   "referenced_type" : "type-496",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9246,8 +9520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9255,8 +9529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9264,8 +9538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1206",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9273,8 +9547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-609",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9282,8 +9556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-537",
+   "referenced_type" : "type-537",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9291,8 +9565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9300,8 +9574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-167",
+   "referenced_type" : "type-162",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9309,8 +9583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9318,8 +9592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-464",
-   "self_type" : "type-578",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9327,8 +9601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-151",
-   "self_type" : "type-153",
+   "referenced_type" : "type-156",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9336,8 +9610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9345,8 +9619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9354,8 +9628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9363,8 +9637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9372,17 +9646,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-574",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9390,8 +9673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9399,8 +9682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-934",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9408,8 +9691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-917",
+   "referenced_type" : "type-919",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9417,8 +9700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9426,8 +9709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-503",
+   "referenced_type" : "type-480",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9435,8 +9718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1592",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9444,8 +9727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9453,8 +9736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1583",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9462,17 +9745,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1387",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1461",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9480,8 +9772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-502",
+   "referenced_type" : "type-504",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9489,8 +9781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9498,8 +9790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9507,8 +9799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9516,8 +9808,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-1249",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1284",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9525,8 +9817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9534,7 +9826,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9543,8 +9835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-401",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-405",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9552,8 +9844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-228",
-   "self_type" : "type-229",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9561,8 +9853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-207",
-   "self_type" : "type-211",
+   "referenced_type" : "type-212",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9570,8 +9862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-217",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9579,8 +9871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-445",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9588,8 +9880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-234",
-   "self_type" : "type-235",
+   "referenced_type" : "type-239",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9597,8 +9889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9606,8 +9898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9615,8 +9907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9624,8 +9916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-191",
+   "referenced_type" : "type-190",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9633,8 +9925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-386",
+   "referenced_type" : "type-406",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9642,8 +9934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-590",
-   "self_type" : "type-594",
+   "referenced_type" : "type-620",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9651,8 +9943,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-507",
-   "self_type" : "type-858",
+   "referenced_type" : "type-515",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9660,8 +9952,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-980",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9669,8 +9961,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-1462",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9678,8 +9970,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-364",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-369",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9687,8 +9979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9696,8 +9988,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-1445",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9705,8 +9997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-296",
-   "self_type" : "type-847",
+   "referenced_type" : "type-297",
+   "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9714,8 +10006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-877",
+   "referenced_type" : "type-908",
+   "self_type" : "type-909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9723,8 +10015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-875",
+   "referenced_type" : "type-906",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9732,101 +10024,101 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1363",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1027",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1115",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1215",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1305",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1564",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
    "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-661",
+   "self_type" : "type-663",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-789",
-   "self_type" : "type-791",
+   "referenced_type" : "type-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-867",
-   "self_type" : "type-869",
+   "referenced_type" : "type-843",
+   "self_type" : "type-845",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-920",
+   "self_type" : "type-922",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-966",
+   "referenced_type" : "type-952",
+   "self_type" : "type-962",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-484",
+   "referenced_type" : "type-391",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9834,8 +10126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-861",
+   "referenced_type" : "type-899",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9843,8 +10135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-855",
+   "referenced_type" : "type-884",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9852,8 +10144,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-848",
-   "self_type" : "type-853",
+   "referenced_type" : "type-863",
+   "self_type" : "type-871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9861,8 +10153,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-1075",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9870,8 +10162,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-1169",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1134",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9879,8 +10171,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-1202",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9888,71 +10180,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-1520",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-282",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-525",
+   "self_type" : "type-527",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-687",
+   "self_type" : "type-689",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-860",
+   "self_type" : "type-862",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-937",
+   "self_type" : "type-940",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1000",
+   "self_type" : "type-999",
+   "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-1091",
+   "self_type" : "type-1090",
+   "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-1200",
+   "self_type" : "type-1199",
+   "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-1357",
+   "self_type" : "type-1356",
+   "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-1512",
+   "self_type" : "type-1511",
+   "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-1523",
    "self_type" : "type-1522",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-504",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-984",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+   "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-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-188",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9960,8 +10306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-402",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9969,8 +10315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9978,8 +10324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-822",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9987,8 +10333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9996,62 +10342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-182",
-   "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-378",
-   "self_type" : "type-377",
-   "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-587",
-   "self_type" : "type-705",
-   "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-768",
-   "self_type" : "type-767",
-   "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-845",
-   "self_type" : "type-844",
-   "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-851",
-   "self_type" : "type-850",
-   "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-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10059,8 +10351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10068,8 +10360,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-859",
+   "referenced_type" : "type-37",
+   "self_type" : "type-895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10077,8 +10369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-865",
-   "self_type" : "type-866",
+   "referenced_type" : "type-904",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10086,8 +10378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-856",
-   "self_type" : "type-857",
+   "referenced_type" : "type-892",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10095,8 +10387,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1121",
    "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"
   },
@@ -10105,7 +10397,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1345",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -10114,7 +10406,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1358",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -10125,8 +10417,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -10134,8 +10426,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10143,8 +10435,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1323",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10152,8 +10444,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10161,8 +10453,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10170,8 +10462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10180,7 +10472,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-889",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10188,8 +10480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10197,8 +10489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10206,8 +10498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10215,8 +10507,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10224,8 +10516,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-250",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10233,8 +10525,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10242,8 +10534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10251,8 +10543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10260,8 +10552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10269,8 +10561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-839",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10287,8 +10579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10305,8 +10597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-878",
-   "self_type" : "type-881",
+   "referenced_type" : "type-910",
+   "self_type" : "type-911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10314,8 +10606,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10323,8 +10615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10332,8 +10624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10341,8 +10633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-296",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10350,8 +10642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-657",
+   "referenced_type" : "type-643",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10359,8 +10651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-510",
+   "referenced_type" : "type-200",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10368,8 +10660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10377,8 +10669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10386,8 +10678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-272",
+   "referenced_type" : "type-210",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10395,8 +10687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-498",
+   "referenced_type" : "type-424",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10404,17 +10696,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-651",
+   "referenced_type" : "type-635",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-1221",
+   "self_type" : "type-1335",
+   "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-1236",
+   "self_type" : "type-1354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1229",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10422,8 +10732,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-1279",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10431,8 +10741,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-1265",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10440,8 +10750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10449,8 +10759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10467,8 +10777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10476,8 +10786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10485,8 +10795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10494,8 +10804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10503,8 +10813,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "type-603",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10512,8 +10822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10521,8 +10831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-245",
+   "referenced_type" : "type-246",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10530,8 +10840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10539,8 +10849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-618",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10548,8 +10858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-561",
-   "self_type" : "type-575",
+   "referenced_type" : "type-552",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10557,8 +10867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-624",
+   "referenced_type" : "type-629",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10566,17 +10876,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-523",
+   "referenced_type" : "type-248",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1319",
+   "self_type" : "type-1344",
+   "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-1351",
+   "self_type" : "type-1355",
+   "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-1359",
+   "self_type" : "type-1360",
+   "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-146",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-151",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10584,8 +10921,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-696",
+   "referenced_type" : "type-483",
+   "self_type" : "type-750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10593,8 +10939,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-973",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10602,8 +10948,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-954",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10611,8 +10957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-672",
+   "referenced_type" : "type-104",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10620,8 +10966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-606",
+   "referenced_type" : "type-247",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10629,8 +10975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1477",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10638,8 +10984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1470",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10647,8 +10993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-352",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10656,8 +11002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-338",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10665,8 +11011,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
+   "referenced_type" : "type-338",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10674,8 +11020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10683,8 +11029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-376",
+   "referenced_type" : "type-140",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10692,8 +11038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-226",
+   "referenced_type" : "type-195",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10701,8 +11047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-215",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10710,8 +11056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-219",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10719,8 +11065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10728,8 +11074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10737,8 +11083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10746,8 +11092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10755,8 +11101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10764,8 +11110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-355",
+   "referenced_type" : "type-359",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10773,8 +11119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-563",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10783,7 +11129,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-74",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10818,8 +11164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10827,8 +11173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-232",
+   "referenced_type" : "type-194",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10836,8 +11182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-418",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10845,8 +11191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10854,8 +11200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10863,8 +11209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-197",
+   "referenced_type" : "type-197",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10872,8 +11218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-399",
+   "referenced_type" : "type-414",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10881,8 +11227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10890,8 +11236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10899,8 +11245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-143",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10908,8 +11254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-206",
+   "referenced_type" : "type-207",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10917,8 +11263,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-404",
-   "self_type" : "type-409",
+   "referenced_type" : "type-421",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10926,8 +11272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "type-632",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10935,8 +11281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10944,8 +11290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1533",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10953,8 +11299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-201",
+   "referenced_type" : "type-203",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10962,8 +11308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10971,8 +11317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-601",
+   "referenced_type" : "type-630",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10980,8 +11326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10989,8 +11335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-139",
+   "self_type" : "type-1527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10998,8 +11344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "type-193",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11007,8 +11353,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11016,17 +11362,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-123",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11034,8 +11389,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11043,8 +11398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-491",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11052,8 +11407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-501",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11061,8 +11416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-929",
+   "referenced_type" : "type-929",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11071,7 +11426,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-80",
-   "self_type" : "type-956",
+   "self_type" : "type-997",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11079,8 +11434,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-646",
+   "referenced_type" : "type-482",
+   "self_type" : "type-671",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11088,8 +11452,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-972",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1014",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11097,8 +11461,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-953",
-   "self_type" : "type-961",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11106,8 +11470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-370",
+   "referenced_type" : "type-103",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11115,8 +11479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11124,8 +11488,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-198",
+   "self_type" : "type-1207",
    "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"
   },
@@ -11142,8 +11506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11151,8 +11515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11169,8 +11533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-29",
+   "referenced_type" : "type-16",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11178,8 +11542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-260",
+   "referenced_type" : "type-24",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11187,8 +11551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-416",
+   "referenced_type" : "type-415",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11196,8 +11560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11205,8 +11569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
+   "referenced_type" : "type-230",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11214,8 +11578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-219",
+   "referenced_type" : "type-213",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11223,8 +11587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11232,8 +11596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-440",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11241,8 +11605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11250,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11259,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11268,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11277,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-237",
+   "referenced_type" : "type-191",
+   "self_type" : "type-242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11286,8 +11650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-407",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11295,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11304,8 +11668,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-490",
-   "self_type" : "type-489",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11313,8 +11677,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-194",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11322,8 +11686,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-265",
-   "self_type" : "type-278",
+   "referenced_type" : "type-268",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11331,8 +11695,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-352",
-   "self_type" : "type-363",
+   "referenced_type" : "type-335",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11340,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11349,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-625",
+   "referenced_type" : "type-528",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11358,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-916",
+   "referenced_type" : "type-499",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11368,7 +11732,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1442",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11376,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11385,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11394,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-609",
+   "referenced_type" : "type-57",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11403,8 +11767,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1085",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11412,8 +11776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-885",
+   "referenced_type" : "type-912",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11421,8 +11785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-43",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11430,8 +11794,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11439,8 +11803,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11448,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11457,8 +11821,8 @@
    "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-1217",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11466,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11475,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11484,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11493,8 +11857,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1558",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11502,8 +11866,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-249",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11511,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11520,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-656",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11529,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-584",
+   "self_type" : "type-599",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11538,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-558",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11547,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-699",
+   "referenced_type" : "type-752",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11556,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11565,8 +11929,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-181",
+   "referenced_type" : "type-181",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11574,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
+   "referenced_type" : "type-125",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11583,8 +11947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-175",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11592,8 +11956,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-171",
+   "referenced_type" : "type-175",
+   "self_type" : "type-176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11601,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11610,8 +11983,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-1427",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11619,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11628,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11637,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11646,8 +12019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-614",
+   "referenced_type" : "type-619",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11655,8 +12028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11664,8 +12037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11673,8 +12046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "referenced_type" : "type-357",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11682,8 +12055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11691,8 +12064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-336",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11700,8 +12073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11709,8 +12082,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11718,8 +12091,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-317",
+   "referenced_type" : "type-321",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11727,8 +12100,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-223",
-   "self_type" : "type-224",
+   "referenced_type" : "type-228",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11736,8 +12109,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-319",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11745,8 +12118,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11754,8 +12127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11763,8 +12136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11772,8 +12145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11781,8 +12154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "type-590",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11790,8 +12163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11799,8 +12172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-323",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11808,8 +12181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11817,8 +12190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11826,8 +12199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-150",
+   "referenced_type" : "type-142",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11835,8 +12208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11844,8 +12217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-569",
-   "self_type" : "type-570",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11853,8 +12226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-746",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11862,8 +12235,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11871,8 +12244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-134",
+   "referenced_type" : "type-138",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11880,8 +12253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
+   "referenced_type" : "type-333",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11889,8 +12262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11898,17 +12271,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-692",
+   "referenced_type" : "type-743",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11916,8 +12298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11925,8 +12307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-942",
+   "referenced_type" : "type-934",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11934,8 +12316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11943,8 +12325,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-466",
+   "referenced_type" : "type-480",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11952,8 +12334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11961,8 +12343,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1575",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11970,8 +12352,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11979,8 +12361,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1579",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11988,8 +12379,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11997,8 +12388,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12006,8 +12397,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12015,8 +12406,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12024,8 +12415,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1467",
    "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"
   },
@@ -12033,8 +12424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12042,8 +12433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-288",
+   "referenced_type" : "type-290",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12051,8 +12442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1413",
    "size" : 4,
    "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"
   },
@@ -12060,8 +12451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-49",
+   "self_type" : "type-1537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12069,8 +12460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-264",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12078,7 +12469,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -12087,8 +12478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12096,8 +12487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12105,8 +12496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-222",
+   "referenced_type" : "type-212",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12114,8 +12505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-218",
+   "referenced_type" : "type-221",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12123,8 +12514,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-451",
+   "referenced_type" : "type-453",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12132,8 +12523,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-236",
+   "referenced_type" : "type-239",
+   "self_type" : "type-241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12141,8 +12532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12150,8 +12541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12159,8 +12550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12168,8 +12559,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-240",
+   "referenced_type" : "type-190",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12177,8 +12568,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-427",
+   "referenced_type" : "type-406",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12186,8 +12577,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-590",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12195,8 +12586,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-507",
-   "self_type" : "type-506",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12204,8 +12595,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-980",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12213,8 +12604,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-1462",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12222,8 +12613,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-283",
-   "self_type" : "type-286",
+   "referenced_type" : "type-281",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12231,8 +12622,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-364",
-   "self_type" : "type-371",
+   "referenced_type" : "type-369",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12240,8 +12631,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12249,8 +12640,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-944",
-   "self_type" : "type-957",
+   "referenced_type" : "type-951",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12258,8 +12649,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-1445",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12267,8 +12658,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12276,8 +12667,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12285,7 +12676,7 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-391",
    "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -12294,8 +12685,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12303,8 +12694,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12312,8 +12703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-865",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12321,8 +12712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1098",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12330,8 +12721,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12339,8 +12730,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1024",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12348,8 +12739,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-582",
+   "referenced_type" : "type-392",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12357,8 +12748,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-644",
+   "referenced_type" : "type-170",
+   "self_type" : "type-654",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12367,7 +12758,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-90",
-   "self_type" : "type-104",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12376,7 +12767,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1519",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12385,7 +12776,7 @@
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
    "referenced_type" : "type-83",
-   "self_type" : "type-1160",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12393,8 +12784,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12402,8 +12793,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12411,8 +12802,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-42",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12424,8 +12815,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12434,8 +12825,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12444,8 +12835,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12454,8 +12845,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12464,8 +12855,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-250",
-   "self_type" : "type-252",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12474,8 +12865,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-441",
-   "self_type" : "type-443",
+   "referenced_type" : "type-255",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12484,8 +12875,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
+   "referenced_type" : "type-456",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12494,8 +12885,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-714",
-   "self_type" : "type-716",
+   "referenced_type" : "type-658",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12504,8 +12895,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-785",
-   "self_type" : "type-787",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12514,8 +12905,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
+   "referenced_type" : "type-838",
+   "self_type" : "type-841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12534,8 +12925,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-958",
-   "self_type" : "type-960",
+   "referenced_type" : "type-916",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12544,8 +12935,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-144",
+   "referenced_type" : "type-17",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12554,8 +12945,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-643",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-653",
+   "self_type" : "type-1106",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12565,7 +12956,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-882",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12574,8 +12965,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12584,8 +12975,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12594,8 +12985,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-50",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-36",
+   "self_type" : "type-1361",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12604,8 +12995,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-143",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-148",
+   "self_type" : "type-1174",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12614,8 +13005,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-1206",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1229",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12624,8 +13015,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-1220",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1245",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12634,8 +13025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1205",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12644,8 +13035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1551",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12654,8 +13045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-584",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-607",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12664,8 +13055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1557",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12674,8 +13065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-241",
-   "self_type" : "type-248",
+   "referenced_type" : "type-246",
+   "self_type" : "type-253",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12684,8 +13075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12694,8 +13085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-617",
-   "self_type" : "type-622",
+   "referenced_type" : "type-648",
+   "self_type" : "type-656",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12704,8 +13095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-581",
+   "referenced_type" : "type-552",
+   "self_type" : "type-584",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12714,8 +13105,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-526",
+   "referenced_type" : "type-248",
+   "self_type" : "type-537",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12724,8 +13115,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12734,8 +13125,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-698",
+   "referenced_type" : "type-483",
+   "self_type" : "type-752",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12744,8 +13135,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12754,8 +13145,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12765,7 +13156,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-135",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12775,7 +13166,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-76",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12785,7 +13176,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12794,8 +13195,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-973",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1507",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12804,8 +13205,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-954",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1501",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12814,8 +13215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12824,8 +13225,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-1002",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12834,8 +13235,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-104",
+   "self_type" : "type-1437",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12844,8 +13245,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-242",
-   "self_type" : "type-610",
+   "referenced_type" : "type-247",
+   "self_type" : "type-619",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12854,8 +13255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1482",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12864,8 +13265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12874,8 +13275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-354",
+   "self_type" : "type-357",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12884,8 +13285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-350",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12894,8 +13295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-343",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12904,8 +13305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1438",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12914,8 +13315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12924,8 +13325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12934,8 +13335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-417",
+   "self_type" : "type-1454",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12944,8 +13345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-408",
+   "referenced_type" : "type-140",
+   "self_type" : "type-411",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12954,8 +13355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-316",
+   "referenced_type" : "type-195",
+   "self_type" : "type-321",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12964,8 +13365,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-223",
+   "referenced_type" : "type-215",
+   "self_type" : "type-228",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12974,8 +13375,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-314",
+   "referenced_type" : "type-219",
+   "self_type" : "type-319",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12984,8 +13385,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12994,8 +13395,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-703",
+   "referenced_type" : "type-486",
+   "self_type" : "type-756",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13004,8 +13405,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-487",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13014,8 +13415,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13024,8 +13425,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-464",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13034,8 +13435,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1436",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13044,8 +13445,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-157",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13054,8 +13455,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13064,8 +13465,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13074,8 +13475,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-185",
+   "self_type" : "type-1571",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13084,8 +13485,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1489",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -13094,8 +13495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-359",
+   "referenced_type" : "type-361",
+   "self_type" : "type-365",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -13104,8 +13505,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-567",
+   "referenced_type" : "type-587",
+   "self_type" : "type-590",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -13115,7 +13516,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-88",
-   "self_type" : "type-112",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13125,7 +13526,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-79",
-   "self_type" : "type-173",
+   "self_type" : "type-178",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13135,7 +13536,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-96",
-   "self_type" : "type-169",
+   "self_type" : "type-174",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13145,7 +13546,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-89",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13155,7 +13556,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-97",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13164,8 +13565,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-444",
+   "self_type" : "type-1456",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -13174,8 +13575,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-318",
+   "referenced_type" : "type-194",
+   "self_type" : "type-323",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -13184,8 +13585,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-549",
+   "referenced_type" : "type-410",
+   "self_type" : "type-570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -13195,7 +13596,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13204,8 +13605,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-573",
+   "referenced_type" : "type-102",
+   "self_type" : "type-597",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13214,8 +13615,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13224,8 +13625,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13234,8 +13635,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-142",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13244,8 +13645,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-361",
+   "referenced_type" : "type-207",
+   "self_type" : "type-367",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -13254,8 +13655,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-569",
+   "referenced_type" : "type-421",
+   "self_type" : "type-593",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13264,8 +13665,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-694",
+   "referenced_type" : "type-632",
+   "self_type" : "type-746",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -13275,7 +13676,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13284,8 +13685,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-461",
+   "self_type" : "type-1458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13294,8 +13695,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-139",
+   "self_type" : "type-138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -13304,8 +13705,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-328",
+   "referenced_type" : "type-193",
+   "self_type" : "type-333",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -13314,8 +13715,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-409",
+   "self_type" : "type-581",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -13324,18 +13725,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-690",
+   "referenced_type" : "type-623",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-119",
-   "self_type" : "type-122",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13345,7 +13766,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13354,8 +13775,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1497",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13364,8 +13785,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-501",
+   "self_type" : "type-1520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13374,8 +13795,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-165",
+   "self_type" : "type-1099",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13384,8 +13805,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-920",
-   "self_type" : "type-935",
+   "referenced_type" : "type-929",
+   "self_type" : "type-934",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13395,7 +13816,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-80",
-   "self_type" : "type-897",
+   "self_type" : "type-919",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13404,8 +13825,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-571",
+   "referenced_type" : "type-482",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13414,8 +13835,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-465",
+   "referenced_type" : "type-473",
+   "self_type" : "type-480",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13424,8 +13845,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1572",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13435,7 +13856,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-84",
-   "self_type" : "type-1501",
+   "self_type" : "type-1574",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13445,7 +13866,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-75",
-   "self_type" : "type-1507",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13455,7 +13876,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-92",
-   "self_type" : "type-1504",
+   "self_type" : "type-1577",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13464,8 +13895,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-953",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13474,8 +13905,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13484,8 +13915,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1032",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13494,8 +13925,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1048",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13504,8 +13935,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13514,8 +13945,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-1390",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1466",
    "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"
   },
@@ -13524,8 +13955,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-1092",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1120",
    "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"
   },
@@ -13535,7 +13966,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-1233",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13544,8 +13975,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-1232",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1279",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13554,8 +13985,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-267",
-   "self_type" : "type-287",
+   "referenced_type" : "type-270",
+   "self_type" : "type-290",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13564,8 +13995,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-1342",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13574,8 +14005,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-1341",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1417",
    "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"
   },
@@ -13584,8 +14015,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-354",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-1412",
    "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"
   },
@@ -13594,8 +14025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13604,8 +14035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13614,8 +14045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-420",
+   "referenced_type" : "type-415",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13624,8 +14055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-401",
+   "referenced_type" : "type-372",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13634,8 +14065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13644,8 +14075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "type-213",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13654,8 +14085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-217",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13664,8 +14095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-444",
+   "referenced_type" : "type-442",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13674,8 +14105,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-231",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13684,8 +14115,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13694,8 +14125,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-486",
+   "referenced_type" : "type-459",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13704,8 +14135,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13714,8 +14145,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "type-191",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13724,8 +14155,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13734,8 +14165,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +14175,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-490",
-   "self_type" : "type-507",
+   "referenced_type" : "type-496",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13754,8 +14185,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-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13764,8 +14195,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-194",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13774,8 +14205,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-265",
-   "self_type" : "type-283",
+   "referenced_type" : "type-268",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13784,8 +14215,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-352",
-   "self_type" : "type-364",
+   "referenced_type" : "type-335",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13794,8 +14225,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13804,8 +14235,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-493",
-   "self_type" : "type-944",
+   "referenced_type" : "type-499",
+   "self_type" : "type-951",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13815,7 +14246,7 @@
    "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-3",
-   "self_type" : "type-1445",
+   "self_type" : "type-1519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13824,8 +14255,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-296",
+   "referenced_type" : "type-39",
+   "self_type" : "type-297",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13834,8 +14265,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13844,8 +14275,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13855,7 +14286,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-91",
-   "self_type" : "type-876",
+   "self_type" : "type-908",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13864,8 +14295,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-807",
-   "self_type" : "type-872",
+   "referenced_type" : "type-835",
+   "self_type" : "type-906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13874,8 +14305,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13883,96 +14314,96 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1213",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1562",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/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-662",
+   "self_type" : "type-661",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-946",
-   "self_type" : "type-945",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13980,8 +14411,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13990,8 +14421,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-860",
+   "referenced_type" : "type-32",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14000,8 +14431,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14010,8 +14441,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-854",
+   "referenced_type" : "type-730",
+   "self_type" : "type-884",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14020,8 +14451,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-849",
-   "self_type" : "type-848",
+   "referenced_type" : "type-864",
+   "self_type" : "type-863",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14030,8 +14461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14040,8 +14471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1165",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14050,8 +14481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1268",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14060,8 +14491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14070,8 +14501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14080,8 +14511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14090,8 +14521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-560",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14100,8 +14531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14110,8 +14541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14120,8 +14551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14130,8 +14561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14140,8 +14571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-915",
-   "self_type" : "type-914",
+   "referenced_type" : "type-977",
+   "self_type" : "type-976",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14150,8 +14581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14160,8 +14591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14170,8 +14601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14180,8 +14611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14190,8 +14621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14200,8 +14631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14210,8 +14641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14220,8 +14651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14230,8 +14661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14240,8 +14671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14250,8 +14681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14260,8 +14691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-905",
-   "self_type" : "type-904",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14270,8 +14701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1065",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14280,8 +14711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14290,8 +14721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1263",
+   "self_type" : "type-1262",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14300,8 +14731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14310,8 +14741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14320,8 +14751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-312",
+   "self_type" : "type-311",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14330,8 +14761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14340,8 +14771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14350,8 +14781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14360,8 +14791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14370,8 +14801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-834",
-   "self_type" : "type-833",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14380,8 +14811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14390,8 +14821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14400,8 +14831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14410,8 +14841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14420,8 +14851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14430,8 +14861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14440,8 +14871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14450,8 +14881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14460,8 +14891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14470,8 +14901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14480,8 +14911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-742",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14490,8 +14921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14500,8 +14931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-968",
+   "self_type" : "type-967",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14510,8 +14941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1063",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14520,8 +14951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14530,8 +14961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14540,8 +14971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14550,8 +14981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14560,8 +14991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14570,8 +15001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14580,8 +15011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14590,8 +15021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14600,8 +15031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14610,8 +15041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-831",
-   "self_type" : "type-830",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14620,8 +15051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-906",
+   "referenced_type" : "type-964",
+   "self_type" : "type-963",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14630,8 +15061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14640,8 +15071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14650,8 +15081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1266",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14660,8 +15091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14670,8 +15101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14680,8 +15111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14690,8 +15121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14700,8 +15131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14710,8 +15141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14720,8 +15151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14730,8 +15161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-838",
-   "self_type" : "type-837",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14740,8 +15171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-913",
-   "self_type" : "type-912",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14750,8 +15181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14760,8 +15191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14770,8 +15201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14780,8 +15211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14790,8 +15221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14800,8 +15231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14810,8 +15241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14820,8 +15251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "type-61",
+   "self_type" : "type-60",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14830,8 +15261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14840,8 +15271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14850,8 +15281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-877",
+   "self_type" : "type-876",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14860,8 +15291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14870,8 +15301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14880,8 +15311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14890,8 +15321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1109",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14900,8 +15331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1272",
+   "self_type" : "type-1271",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14910,8 +15341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14920,8 +15351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14930,8 +15361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-562",
+   "self_type" : "type-561",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14940,8 +15371,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-918",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14950,18 +15401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
-   "size" : 28,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14980,8 +15421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1170",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14990,8 +15431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15000,8 +15441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15010,8 +15451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15020,8 +15461,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15030,18 +15501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
-   "size" : 24,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15060,8 +15521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15070,8 +15531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15080,8 +15541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15090,8 +15551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15100,8 +15561,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15110,8 +15601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15120,8 +15611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1175",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15140,8 +15631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15150,8 +15641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15160,8 +15651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-332",
+   "self_type" : "type-331",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15170,8 +15661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15180,8 +15671,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-926",
-   "self_type" : "type-925",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15190,8 +15701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15200,8 +15711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15210,48 +15721,168 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-137",
+   "self_type" : "type-136",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-993",
+   "self_type" : "type-992",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1280",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-130",
    "self_type" : "type-129",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15260,8 +15891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15270,8 +15901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15280,8 +15911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15290,8 +15921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15300,8 +15931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15310,8 +15941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1180",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15320,8 +15951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-1262",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15330,8 +15961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15340,8 +15971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15350,8 +15981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15360,638 +15991,708 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1034",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::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",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-680",
+   "self_type" : "type-679",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-854",
+   "self_type" : "type-853",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "referenced_type" : "type-931",
    "self_type" : "type-930",
-   "size" : 68,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1117",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::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",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1254",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-707",
+   "self_type" : "type-706",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-875",
+   "self_type" : "type-874",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-705",
+   "self_type" : "type-704",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1039",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1233",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-861",
+   "self_type" : "type-860",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1016",
+   "self_type" : "type-1015",
+   "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-1031",
+   "self_type" : "type-1030",
+   "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-1119",
+   "self_type" : "type-1118",
+   "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-1220",
+   "self_type" : "type-1219",
+   "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-1568",
+   "self_type" : "type-1567",
+   "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-265",
+   "self_type" : "type-264",
+   "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-471",
+   "self_type" : "type-470",
+   "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-667",
+   "self_type" : "type-666",
+   "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-850",
+   "self_type" : "type-849",
+   "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-926",
+   "self_type" : "type-925",
+   "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-1004",
+   "self_type" : "type-1003",
+   "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-1029",
+   "self_type" : "type-1028",
+   "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-1117",
+   "self_type" : "type-1116",
+   "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-1218",
+   "self_type" : "type-1217",
+   "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-1566",
+   "self_type" : "type-1565",
+   "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-262",
+   "self_type" : "type-261",
+   "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-468",
+   "self_type" : "type-467",
+   "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-665",
+   "self_type" : "type-664",
+   "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-848",
+   "self_type" : "type-847",
+   "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-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "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-1001",
+   "self_type" : "type-1000",
+   "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-1092",
+   "self_type" : "type-1091",
+   "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-1201",
+   "self_type" : "type-1200",
+   "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-1358",
+   "self_type" : "type-1357",
+   "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-1513",
    "self_type" : "type-1512",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.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-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1090",
-   "self_type" : "type-1089",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-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"
-  },
-  {
-   "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-671",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1181",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-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"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-998",
-   "self_type" : "type-997",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1169",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1202",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1521",
-   "self_type" : "type-1520",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-985",
-   "self_type" : "type-984",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1061",
-   "self_type" : "type-1060",
-   "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-1154",
-   "self_type" : "type-1153",
-   "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-1495",
-   "self_type" : "type-1494",
-   "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-259",
-   "self_type" : "type-258",
-   "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-453",
-   "self_type" : "type-452",
-   "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-640",
-   "self_type" : "type-639",
-   "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-796",
-   "self_type" : "type-795",
-   "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-874",
-   "self_type" : "type-873",
-   "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-970",
-   "self_type" : "type-969",
-   "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-995",
-   "self_type" : "type-994",
-   "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-1059",
-   "self_type" : "type-1058",
-   "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-1152",
-   "self_type" : "type-1151",
-   "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-1493",
-   "self_type" : "type-1492",
-   "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-257",
-   "self_type" : "type-256",
-   "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-450",
-   "self_type" : "type-449",
-   "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-638",
-   "self_type" : "type-637",
-   "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-794",
-   "self_type" : "type-793",
-   "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-871",
-   "self_type" : "type-870",
-   "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-963",
-   "self_type" : "type-962",
-   "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-968",
-   "self_type" : "type-967",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+   "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-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16000,8 +16701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16010,8 +16711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16020,8 +16721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16030,8 +16731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16040,8 +16741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16050,58 +16751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
-   "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-588",
-   "self_type" : "type-587",
-   "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-769",
-   "self_type" : "type-768",
-   "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-846",
-   "self_type" : "type-845",
-   "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-852",
-   "self_type" : "type-851",
-   "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-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16111,7 +16762,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-90",
-   "self_type" : "type-1043",
+   "self_type" : "type-1084",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16121,7 +16772,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-51",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16131,7 +16782,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-83",
-   "self_type" : "type-865",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16140,8 +16791,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-856",
+   "referenced_type" : "type-396",
+   "self_type" : "type-892",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16149,8 +16800,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-29",
+   "self_type" : "type-1097",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16158,8 +16809,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-39",
+   "self_type" : "type-300",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -16168,8 +16819,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-58",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -16183,14 +16834,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16202,17 +16853,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-51"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-44", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16222,37 +16873,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
+     "referenced_type" : "type-652"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
+   "name" : "android::LightRefBase<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-653" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
      "referenced_type" : "type-642"
     }
    ],
-   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
-   "name" : "android::LightRefBase<android::NativeHandle>",
+   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
+   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
    "referenced_type" : "type-641",
    "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "template_args" : [ "type-643" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-633" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16262,14 +16913,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-34"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16281,14 +16932,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1398"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1323",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16298,7 +16949,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-651"
     }
    ],
    "fields" :
@@ -16307,20 +16958,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16332,14 +16983,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16351,14 +17002,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1406"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16370,14 +17021,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1406"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16448,8 +17099,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
+   "referenced_type" : "type-915",
+   "self_type" : "type-915",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16459,8 +17110,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16492,8 +17143,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16504,17 +17155,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-52"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16561,14 +17212,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16626,14 +17277,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-45"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -16645,14 +17296,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -16672,62 +17323,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-297"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -16817,17 +17468,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -16874,7 +17525,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
@@ -16886,20 +17537,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -16951,14 +17602,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-641"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-643",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -16986,7 +17637,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -16995,32 +17646,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -17136,7 +17787,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     },
     {
      "access" : "private",
@@ -17148,14 +17799,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -17243,23 +17894,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17432,23 +18083,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17633,23 +18284,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17826,23 +18477,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18119,23 +18770,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18312,23 +18963,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -18501,23 +19152,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18694,23 +19345,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -19027,23 +19678,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -19216,23 +19867,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -19421,23 +20072,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -19618,23 +20269,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -19871,6 +20522,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -19979,23 +20634,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-635",
+   "self_type" : "type-635",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -20068,6 +20723,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -20179,17 +20838,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -20359,23 +21018,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1222"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1223"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1221",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-1209" ],
+   "template_args" : [ "type-3", "type-1224" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -20385,23 +21044,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1237"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1222"
+     "referenced_type" : "type-1238"
     }
    ],
    "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-1220",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1236",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-39" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -20411,23 +21070,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-1248"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1231"
+     "referenced_type" : "type-1249"
     }
    ],
    "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-1229",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1247",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1232", "type-1047" ],
+   "template_args" : [ "type-1250", "type-1088" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -20437,23 +21096,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1307"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1308"
     }
    ],
    "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-1279",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1306",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1282", "type-1283" ],
+   "template_args" : [ "type-1309", "type-1310" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -20463,23 +21122,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1266"
+     "referenced_type" : "type-1290"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1267"
+     "referenced_type" : "type-1291"
     }
    ],
    "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-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1289",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1268", "type-1269" ],
+   "template_args" : [ "type-1292", "type-1293" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -20508,8 +21167,8 @@
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -20520,7 +21179,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-920"
+     "referenced_type" : "type-929"
     },
     {
      "is_virtual" : true,
@@ -20530,8 +21189,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
+   "referenced_type" : "type-950",
+   "self_type" : "type-950",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -20618,8 +21277,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -20823,8 +21482,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -20906,13 +21565,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-971"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1103"
     },
     {
      "access" : "private",
@@ -20929,11 +21588,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -20949,19 +21608,19 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1193"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
@@ -20985,7 +21644,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1194"
     },
     {
      "access" : "private",
@@ -21015,38 +21674,38 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 448,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 456,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 464,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-1195"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -21073,8 +21732,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -21094,25 +21753,25 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
@@ -21130,86 +21789,86 @@
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-35"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 512,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-40"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-54"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 800,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 808,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -21287,7 +21946,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -21297,8 +21956,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -21308,7 +21967,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21317,17 +21976,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1424"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1351" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -21335,7 +21994,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21344,17 +22003,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-460" ],
+   "template_args" : [ "type-459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -21362,7 +22021,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21371,17 +22030,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1526"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1453" ],
+   "template_args" : [ "type-1526" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -21389,7 +22048,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21398,17 +22057,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-186" ],
+   "template_args" : [ "type-191" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -21416,7 +22075,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21425,17 +22084,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-407" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -21443,7 +22102,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21452,17 +22111,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-591" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -21470,7 +22129,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21479,17 +22138,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21497,17 +22156,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21517,26 +22176,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -21546,34 +22205,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1319",
+   "self_type" : "type-1319",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1221" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1351",
+   "self_type" : "type-1351",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1236" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1359",
+   "self_type" : "type-1359",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1247" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -21602,18 +22321,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1224",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -21625,14 +22344,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -21641,8 +22360,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -21651,8 +22370,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -21661,8 +22380,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -21682,8 +22401,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-86",
    "self_type" : "type-86",
@@ -21698,7 +22417,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
@@ -21706,11 +22425,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -21722,7 +22441,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-974"
     },
     {
      "field_name" : "_pad",
@@ -21730,11 +22449,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -21746,7 +22465,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -21754,11 +22473,35 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-485"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-83"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -21770,7 +22513,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
@@ -21778,11 +22521,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -21802,8 +22545,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-77",
    "self_type" : "type-77",
@@ -21818,7 +22561,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "_pad",
@@ -21826,11 +22569,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -21842,7 +22585,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     },
     {
      "field_name" : "_pad",
@@ -21850,11 +22593,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -21874,8 +22617,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-94",
    "self_type" : "type-94",
@@ -21889,16 +22632,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-950"
+     "referenced_type" : "type-973"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-975" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -21907,16 +22650,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -21925,16 +22668,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -21943,16 +22686,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -21961,16 +22704,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -22033,13 +22776,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-74" ],
@@ -22051,16 +22794,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-1008"
     }
    ],
    "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-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-1010" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22069,13 +22830,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-996"
     }
    ],
    "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-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-995",
+   "self_type" : "type-995",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-80" ],
@@ -22087,16 +22848,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -22105,16 +22866,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1058"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22124,7 +22885,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-609"
+     "referenced_type" : "type-615"
     },
     {
      "field_name" : "_pad",
@@ -22132,11 +22893,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22156,7 +22917,7 @@
    "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22166,7 +22927,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
      "field_name" : "_pad",
@@ -22174,8 +22935,8 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-82",
    "self_type" : "type-82",
@@ -22189,16 +22950,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22208,7 +22969,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "_pad",
@@ -22216,11 +22977,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22232,7 +22993,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-975"
+     "referenced_type" : "type-1009"
     },
     {
      "field_name" : "_pad",
@@ -22240,11 +23001,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-974",
-   "self_type" : "type-974",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -22256,7 +23017,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-997"
     },
     {
      "field_name" : "_pad",
@@ -22264,11 +23025,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-996",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22280,7 +23041,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
@@ -22288,11 +23049,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -22303,16 +23064,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1003"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22322,7 +23083,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1004"
+     "referenced_type" : "type-1024"
     },
     {
      "field_name" : "_pad",
@@ -22330,11 +23091,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22345,16 +23106,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22364,7 +23125,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "field_name" : "_pad",
@@ -22372,11 +23133,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22387,13 +23148,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-90" ],
@@ -22406,7 +23167,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "_pad",
@@ -22414,11 +23175,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -22427,8 +23188,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -22440,20 +23201,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22462,8 +23223,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -22473,8 +23234,8 @@
    "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-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -22485,7 +23246,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22494,13 +23255,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1476",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -22622,7 +23383,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22631,13 +23392,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -22759,7 +23520,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22768,13 +23529,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -22896,7 +23657,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22905,13 +23666,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -23033,7 +23794,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23042,13 +23803,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -23170,10 +23931,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1149"
+     "referenced_type" : "type-1188"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23182,19 +23943,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1479"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1407"
+     "referenced_type" : "type-1480"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -23383,10 +24144,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1187"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23395,19 +24156,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1472"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1471",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -23605,10 +24366,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23617,19 +24378,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -23821,10 +24582,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23833,19 +24594,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -24112,10 +24873,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24124,19 +24885,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-341"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -24329,23 +25090,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-164"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-160"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -24360,8 +25121,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -24483,8 +25244,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -24618,8 +25379,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -24745,8 +25506,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -24972,8 +25733,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -25095,18 +25856,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -25127,8 +25888,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -25149,8 +25910,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -25161,13 +25922,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -25193,8 +25954,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -25215,8 +25976,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -25226,7 +25987,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25235,13 +25996,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -25363,7 +26124,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25372,13 +26133,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -25500,7 +26261,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25509,13 +26270,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -25637,10 +26398,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -25649,19 +26410,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1413"
+     "referenced_type" : "type-1487"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1414"
+     "referenced_type" : "type-1488"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1486",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -25850,10 +26611,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -25862,19 +26623,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -26066,10 +26827,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26078,19 +26839,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -26415,7 +27176,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -26479,7 +27240,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -26505,13 +27266,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -26628,13 +27389,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -26755,13 +27516,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -27023,13 +27784,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -27039,7 +27800,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27048,13 +27809,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1313",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -27176,7 +27937,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27185,13 +27946,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1526"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1529",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -27313,7 +28074,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27322,13 +28083,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -27450,7 +28211,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27459,13 +28220,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -27587,7 +28348,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27596,13 +28357,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -27724,10 +28485,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1191"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27736,19 +28497,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1420"
+     "referenced_type" : "type-1494"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1495"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1493",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -27937,10 +28698,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27949,19 +28710,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -28162,10 +28923,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28174,19 +28935,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-208"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -28381,10 +29142,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28393,19 +29154,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-422"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -28599,6 +29360,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -28723,10 +29487,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28735,19 +29499,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-603"
+     "referenced_type" : "type-633"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -28818,6 +29582,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -28942,10 +29709,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28954,19 +29721,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -29097,10 +29864,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29109,19 +29876,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -29264,10 +30031,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29276,19 +30043,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -29425,10 +30192,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29437,19 +30204,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -29643,6 +30410,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -29709,10 +30479,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29721,19 +30491,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -29804,6 +30574,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -29870,13 +30643,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -29993,13 +30766,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -30132,13 +30905,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -30263,13 +31036,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -30508,6 +31281,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -30558,13 +31335,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -30639,6 +31416,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -30685,19 +31466,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-103"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-122"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1045"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30710,13 +31513,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-1011"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1010",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30736,7 +31539,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
@@ -30753,8 +31556,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 40,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -30839,8 +31642,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -30922,19 +31725,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30946,7 +31749,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "access" : "private",
@@ -30963,8 +31766,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -30988,7 +31791,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -31006,7 +31809,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-972"
     },
     {
      "access" : "private",
@@ -31018,16 +31821,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-975" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -31037,7 +31840,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-483"
     },
     {
      "access" : "private",
@@ -31049,16 +31852,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -31068,7 +31871,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -31080,16 +31883,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -31099,7 +31902,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-491"
     },
     {
      "access" : "private",
@@ -31111,16 +31914,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -31130,7 +31933,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
@@ -31142,16 +31945,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -31173,7 +31976,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -31204,7 +32007,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -31235,7 +32038,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -31254,7 +32057,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -31266,13 +32069,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-74" ],
@@ -31285,7 +32088,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -31297,16 +32100,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-1007"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-39"
     }
    ],
    "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-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1006",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-1010" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -31316,7 +32150,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-995"
     },
     {
      "access" : "private",
@@ -31328,13 +32162,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-80" ],
@@ -31347,7 +32181,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -31359,16 +32193,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -31378,7 +32212,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1057"
     },
     {
      "access" : "private",
@@ -31390,16 +32224,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -31409,7 +32243,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1002"
+     "referenced_type" : "type-1022"
     },
     {
      "access" : "private",
@@ -31421,16 +32255,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -31440,7 +32274,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -31452,13 +32286,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -31471,19 +32305,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -31493,10 +32327,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -31505,13 +32339,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -31633,10 +32467,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1142"
+     "referenced_type" : "type-1186"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -31645,19 +32479,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1464"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1465"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1463",
    "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",
@@ -31841,7 +32675,7 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
@@ -31851,13 +32685,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1091",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "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"
@@ -31988,8 +32822,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "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",
@@ -32141,23 +32975,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-1001"
+     "referenced_type" : "type-1021"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1416",
    "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"
@@ -32172,8 +33006,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "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",
@@ -32288,17 +33122,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-295"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-296" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -32308,17 +33142,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32348,17 +33182,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -32368,17 +33202,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -32388,17 +33222,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-40" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -32408,17 +33242,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -32428,17 +33262,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -32448,17 +33282,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -32468,17 +33302,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -32488,17 +33322,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -32508,17 +33342,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-443"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-442",
+   "self_type" : "type-442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -32528,17 +33362,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -32548,17 +33382,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -32568,17 +33402,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -32588,17 +33422,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -32608,17 +33442,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -32628,17 +33462,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -32648,17 +33482,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -32668,17 +33502,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-491"
+     "referenced_type" : "type-497"
     }
    ],
    "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-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -32688,17 +33522,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32714,8 +33548,8 @@
    "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-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -32728,17 +33562,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-269"
     }
    ],
    "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-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-267" ],
+   "template_args" : [ "type-270" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -32748,47 +33582,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-336"
     }
    ],
    "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-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-354" ],
+   "template_args" : [ "type-337" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -32798,63 +33632,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -32864,8 +33698,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -32875,8 +33709,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -32886,63 +33720,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -32952,63 +33786,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33018,8 +33852,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33029,8 +33863,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33040,33 +33874,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -33077,26 +33911,26 @@
    "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -33106,63 +33940,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-708",
+   "self_type" : "type-708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33172,8 +34006,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33183,8 +34017,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33194,85 +34028,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "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-1139",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-44" ],
    "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-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-54" ],
    "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-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -33282,63 +34116,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33348,8 +34182,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33359,8 +34193,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33370,33 +34204,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -33406,7 +34240,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     },
     {
      "access" : "private",
@@ -33418,11 +34252,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -33444,8 +34278,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -33458,7 +34292,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
@@ -33470,11 +34304,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -33509,18 +34343,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -33536,18 +34370,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1380"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1388"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -33558,7 +34392,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1384"
     },
     {
      "field_name" : "num_planes",
@@ -33568,13 +34402,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1386"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -33585,48 +34419,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1381"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -33637,38 +34471,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1316",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1390",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -33679,18 +34513,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -33701,17 +34535,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
@@ -33731,13 +34565,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1380"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -33747,13 +34581,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -33764,35 +34598,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-394"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v3",
      "referenced_type" : "type-395"
     },
     {
+     "field_name" : "entry_v4",
+     "referenced_type" : "type-395"
+    },
+    {
+     "field_name" : "entry_v3",
+     "referenced_type" : "type-398"
+    },
+    {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-400"
     }
    ],
    "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-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "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)"
@@ -33813,8 +34647,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1128",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -33825,43 +34659,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -33872,32 +34706,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -33907,13 +34741,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -33924,32 +34758,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -33959,13 +34793,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -33976,17 +34810,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -34016,13 +34850,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -34033,28 +34867,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-166"
+     "referenced_type" : "type-171"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -34066,8 +34900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34075,8 +34909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-584",
-   "self_type" : "type-586",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34084,8 +34918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34093,8 +34927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-241",
-   "self_type" : "type-246",
+   "referenced_type" : "type-246",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34102,8 +34936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-430",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34111,8 +34945,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-617",
-   "self_type" : "type-619",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34120,8 +34954,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-561",
-   "self_type" : "type-579",
+   "referenced_type" : "type-552",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34129,8 +34963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-620",
-   "self_type" : "type-626",
+   "referenced_type" : "type-629",
+   "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34138,8 +34972,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-540",
+   "referenced_type" : "type-248",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34147,8 +34981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-608",
+   "referenced_type" : "type-247",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34156,8 +34990,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-160",
-   "self_type" : "type-934",
+   "referenced_type" : "type-165",
+   "self_type" : "type-933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -34165,8 +34999,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-920",
-   "self_type" : "type-941",
+   "referenced_type" : "type-929",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -34174,8 +35008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-375",
-   "self_type" : "type-387",
+   "referenced_type" : "type-372",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34183,8 +35017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-208",
-   "self_type" : "type-221",
+   "referenced_type" : "type-213",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34192,8 +35026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-212",
-   "self_type" : "type-415",
+   "referenced_type" : "type-217",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34201,8 +35035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-460",
-   "self_type" : "type-473",
+   "referenced_type" : "type-459",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34210,8 +35044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34219,8 +35053,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-186",
-   "self_type" : "type-238",
+   "referenced_type" : "type-191",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34228,8 +35062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-407",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34237,8 +35071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-591",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34246,8 +35080,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-496",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34255,8 +35089,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-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34264,8 +35098,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-1173",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34273,8 +35107,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-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34282,8 +35116,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-1525",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34291,8 +35125,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-280",
-   "self_type" : "type-279",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34300,8 +35134,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-512",
-   "self_type" : "type-511",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34309,8 +35143,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34318,8 +35152,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-812",
-   "self_type" : "type-811",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34327,8 +35161,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-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34336,8 +35170,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-989",
-   "self_type" : "type-988",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34345,8 +35179,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34354,8 +35188,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34363,8 +35197,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34372,8 +35206,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34381,8 +35215,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34390,8 +35224,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34399,8 +35233,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34408,8 +35242,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
+   "referenced_type" : "type-697",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34417,8 +35251,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34426,8 +35260,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34435,8 +35269,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34444,8 +35278,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34453,8 +35287,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34462,8 +35296,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34471,8 +35305,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34480,8 +35314,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34489,8 +35323,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34498,8 +35332,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34507,8 +35341,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34516,8 +35350,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-945",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }

diff --git a/Q/32/x86/source-based/android.hardware.drm@1.2.so.lsdump b/Q/32/x86/source-based/android.hardware.drm@1.2.so.lsdump
index ad3dfab..f204c54 100644
--- a/Q/32/x86/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/32/x86/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-394",
+   "referenced_type" : "type-57",
+   "self_type" : "type-397",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-57",
+   "self_type" : "type-1033",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-792",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-834",
+   "self_type" : "type-1068",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-41",
-   "self_type" : "type-166",
+   "referenced_type" : "type-27",
+   "self_type" : "type-171",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-887",
+   "self_type" : "type-929",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-90",
-   "self_type" : "type-861",
+   "self_type" : "type-903",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-391",
+   "self_type" : "type-394",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1009",
+   "self_type" : "type-1060",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1
   },
   {
@@ -78,8 +87,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1
   },
   {
@@ -88,8 +97,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -104,8 +113,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 4
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 2
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1
   },
   {
@@ -179,8 +188,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4
   },
   {
@@ -199,15 +208,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -351,6 +360,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -474,6 +486,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -525,6 +540,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -993,6 +1011,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1032,6 +1053,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1047,6 +1071,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1065,6 +1092,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1601,8 +1634,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1619,8 +1652,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1637,8 +1670,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-954",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1663,11 +1696,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1693,11 +1726,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1715,8 +1748,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-941",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1741,11 +1774,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1795,11 +1828,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1849,8 +1882,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1138",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1871,8 +1904,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1905,8 +1938,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1935,8 +1968,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1969,8 +2002,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1995,8 +2028,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2025,8 +2058,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2091,8 +2124,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2235,8 +2268,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2294,6 +2327,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2415,11 +2486,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2433,11 +2504,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2459,8 +2530,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1094",
    "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-90",
@@ -2563,8 +2634,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2589,8 +2660,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2631,8 +2702,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2873,8 +2944,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2903,8 +2974,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2933,8 +3004,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -2975,8 +3046,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3013,8 +3084,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3039,8 +3110,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3057,8 +3128,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3087,8 +3158,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3181,8 +3252,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-992",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3223,8 +3294,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3241,8 +3312,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3271,8 +3342,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3305,8 +3376,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3359,8 +3430,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3376,18 +3447,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
-    },
-    {
-     "referenced_type" : "type-62"
-    },
-    {
      "referenced_type" : "type-42"
+    },
+    {
+     "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-41",
+   "return_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3397,12 +3468,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1021",
-   "return_type" : "type-41",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1072",
+   "return_type" : "type-27",
+   "self_type" : "type-1072",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3412,27 +3483,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-981"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-937",
-   "return_type" : "type-43",
-   "self_type" : "type-937",
+   "referenced_type" : "type-979",
+   "return_type" : "type-29",
+   "self_type" : "type-979",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3445,14 +3516,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3462,16 +3533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3481,13 +3552,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1285"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3497,13 +3568,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1286"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3513,14 +3584,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3530,13 +3601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3546,13 +3617,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1236"
+     "referenced_type" : "type-1287"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3562,14 +3633,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3579,13 +3650,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1288"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3595,10 +3666,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3608,10 +3679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3620,13 +3691,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3636,10 +3707,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3649,16 +3720,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3667,14 +3738,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3683,14 +3754,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3699,14 +3770,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3715,14 +3786,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3733,13 +3804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-1242"
+     "referenced_type" : "type-1293"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3749,13 +3820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3765,13 +3836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3781,14 +3852,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3798,16 +3869,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3817,13 +3888,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1321"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3833,13 +3904,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1322"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3849,14 +3920,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3866,13 +3937,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3882,13 +3953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1323"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3898,14 +3969,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3915,13 +3986,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1273"
+     "referenced_type" : "type-1324"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3931,10 +4002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3944,10 +4015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3956,13 +4027,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3972,10 +4043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3985,16 +4056,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4003,14 +4074,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-234"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4019,14 +4090,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-240"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4035,14 +4106,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4051,14 +4122,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4069,13 +4140,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-1277"
+     "referenced_type" : "type-1328"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4085,13 +4156,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4101,13 +4172,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4117,16 +4188,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -4134,10 +4205,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1331"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4148,13 +4219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1332"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4163,19 +4234,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1333"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4184,19 +4255,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1283"
+     "referenced_type" : "type-1334"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1335"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4205,19 +4297,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1284"
+     "referenced_type" : "type-1336"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4226,19 +4318,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1285"
+     "referenced_type" : "type-1337"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4247,19 +4339,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1286"
+     "referenced_type" : "type-1338"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4268,19 +4360,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1287"
+     "referenced_type" : "type-1339"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4289,19 +4381,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-1340"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4312,10 +4404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4325,13 +4417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4341,13 +4433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4357,10 +4449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4370,10 +4462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4383,10 +4475,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4396,13 +4488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1289"
+     "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4412,13 +4504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4428,16 +4520,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4447,13 +4539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-1342"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4463,16 +4555,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4482,13 +4574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4498,13 +4590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4514,13 +4606,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1343"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4530,13 +4622,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1292"
+     "referenced_type" : "type-1344"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4546,13 +4638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4562,28 +4654,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1294"
+     "referenced_type" : "type-1346"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4593,16 +4685,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1295"
+     "referenced_type" : "type-1347"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4612,13 +4704,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4628,13 +4720,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-1348"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4644,13 +4736,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1297"
+     "referenced_type" : "type-1349"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4660,16 +4752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1298"
+     "referenced_type" : "type-1350"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4679,19 +4771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4701,16 +4793,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1299"
+     "referenced_type" : "type-1351"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4720,16 +4812,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4739,13 +4831,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1300"
+     "referenced_type" : "type-1352"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4755,16 +4847,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1301"
+     "referenced_type" : "type-1353"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4774,13 +4866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4790,13 +4882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1354"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4806,28 +4898,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1303"
+     "referenced_type" : "type-1355"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4837,28 +4929,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1304"
+     "referenced_type" : "type-1356"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4868,16 +4960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1305"
+     "referenced_type" : "type-1357"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4887,13 +4979,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4903,16 +4995,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4922,19 +5014,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1306"
+     "referenced_type" : "type-1358"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4944,13 +5036,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-598"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-425"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4960,16 +5074,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4979,13 +5093,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4995,19 +5109,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5017,13 +5131,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1309"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5033,16 +5147,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5052,10 +5166,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5065,13 +5179,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5081,16 +5195,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5100,13 +5214,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5116,16 +5230,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5135,10 +5249,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5148,10 +5262,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5161,10 +5275,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5174,16 +5288,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-1363"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5192,16 +5306,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1364"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5210,31 +5324,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1313"
+     "referenced_type" : "type-1365"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5244,19 +5358,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1366"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1219"
+    },
+    {
+     "referenced_type" : "type-1194"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5266,16 +5404,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1367"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5284,16 +5422,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5302,16 +5440,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5321,13 +5459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1368"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5336,19 +5474,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1369"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5357,22 +5495,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-1370"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5381,16 +5519,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1319"
+     "referenced_type" : "type-1371"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5400,10 +5538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5413,22 +5551,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1372"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5438,16 +5576,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5457,25 +5595,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1321"
+     "referenced_type" : "type-1373"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5485,25 +5623,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1374"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5513,25 +5651,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1323"
+     "referenced_type" : "type-1375"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5541,25 +5679,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1376"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5569,19 +5707,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5591,13 +5729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5607,13 +5745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5623,14 +5761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5640,16 +5778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5659,13 +5797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1325"
+     "referenced_type" : "type-1377"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5675,13 +5813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1326"
+     "referenced_type" : "type-1378"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5691,14 +5829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5708,13 +5846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5724,13 +5862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1327"
+     "referenced_type" : "type-1379"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5740,14 +5878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5757,13 +5895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1328"
+     "referenced_type" : "type-1380"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5773,10 +5911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5786,10 +5924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5798,13 +5936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5814,10 +5952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5827,16 +5965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5845,14 +5983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-1268"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5861,14 +5999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5877,14 +6015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5894,16 +6032,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -5911,10 +6049,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1329"
+     "referenced_type" : "type-1381"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5925,13 +6063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1382"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5940,19 +6078,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1331"
+     "referenced_type" : "type-1383"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5963,10 +6101,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5976,13 +6114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5992,13 +6130,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6008,10 +6146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6021,10 +6159,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6034,10 +6172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6047,16 +6185,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6066,19 +6204,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1332"
+     "referenced_type" : "type-1384"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6088,13 +6226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1385"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6104,13 +6242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1334"
+     "referenced_type" : "type-1386"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6120,13 +6258,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6136,13 +6274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1335"
+     "referenced_type" : "type-1387"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6152,13 +6290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6168,10 +6306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6181,10 +6319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6194,13 +6332,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6210,13 +6348,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6226,19 +6364,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6247,22 +6385,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6272,10 +6410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6285,16 +6423,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6304,13 +6442,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6320,13 +6458,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6337,13 +6475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1340"
+     "referenced_type" : "type-1392"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6353,13 +6491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6369,13 +6507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6385,14 +6523,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6402,16 +6540,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6421,13 +6559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1396"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6437,13 +6575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1345"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6453,14 +6591,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6470,13 +6608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6486,13 +6624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6502,14 +6640,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6519,13 +6657,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6535,10 +6673,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6548,10 +6686,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6560,13 +6698,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6576,10 +6714,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6589,16 +6727,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6611,10 +6749,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6623,14 +6761,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6639,14 +6777,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6655,14 +6793,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6673,13 +6811,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1403"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6689,13 +6827,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6705,13 +6843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6721,16 +6859,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -6738,10 +6876,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1406"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6752,13 +6890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1407"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6767,19 +6905,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1408"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6790,10 +6928,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6803,13 +6941,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6819,13 +6957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6835,10 +6973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6848,10 +6986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6861,10 +6999,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6874,40 +7012,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1357"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6917,16 +7055,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6936,13 +7074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6952,13 +7090,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1411"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6968,13 +7106,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6984,13 +7122,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1412"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7000,7 +7138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
      "referenced_type" : "type-2"
@@ -7009,7 +7147,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7018,43 +7156,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1413"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7064,13 +7202,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7080,13 +7218,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1414"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7096,16 +7234,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-875"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7115,10 +7253,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7128,10 +7266,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7141,13 +7279,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7157,10 +7295,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7170,16 +7308,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7189,40 +7327,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7232,13 +7370,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7248,13 +7386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7264,16 +7402,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7281,10 +7419,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7295,13 +7433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7312,10 +7450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7325,13 +7463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7341,13 +7479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7357,10 +7495,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7370,10 +7508,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7383,10 +7521,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7396,16 +7534,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7415,19 +7553,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7437,13 +7575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1419"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7453,13 +7591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1420"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7469,13 +7607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7485,13 +7623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7501,13 +7639,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1370"
+     "referenced_type" : "type-1422"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7517,10 +7655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7530,10 +7668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7543,13 +7681,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7559,10 +7697,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7572,16 +7710,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7591,13 +7729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7607,13 +7745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7623,14 +7761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7640,16 +7778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7659,13 +7797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1423"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7675,13 +7813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1424"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7691,14 +7829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7708,13 +7846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7724,13 +7862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7740,14 +7878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7757,13 +7895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1426"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7773,10 +7911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7786,10 +7924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7798,13 +7936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7814,10 +7952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7827,16 +7965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7845,14 +7983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7861,14 +7999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7877,14 +8015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7895,13 +8033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7911,13 +8049,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7927,13 +8065,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7943,16 +8081,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7960,10 +8098,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7974,13 +8112,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1434"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7989,19 +8148,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8012,10 +8171,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8025,13 +8184,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8041,13 +8200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8057,10 +8216,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8070,10 +8229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8083,10 +8242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8096,16 +8255,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8115,13 +8274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8131,13 +8290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8147,13 +8306,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8163,13 +8322,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8179,19 +8338,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8201,13 +8382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8217,16 +8398,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8236,13 +8417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8252,10 +8433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8265,10 +8446,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1219"
+    },
+    {
+     "referenced_type" : "type-1194"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8277,16 +8482,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8296,10 +8501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8309,16 +8514,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8328,19 +8533,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8350,13 +8555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8366,33 +8571,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-210", "type-404" ]
+   "template_args" : [ "type-409", "type-215", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8400,18 +8647,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-404" ]
+   "template_args" : [ "type-409", "type-410", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8419,18 +8666,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-404" ]
+   "template_args" : [ "type-409", "type-5", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8438,18 +8685,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-190", "type-202" ]
+   "template_args" : [ "type-193", "type-195", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8457,18 +8704,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-189", "type-202" ]
+   "template_args" : [ "type-193", "type-194", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8476,18 +8723,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-5", "type-202" ]
+   "template_args" : [ "type-193", "type-5", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8495,18 +8742,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-133", "type-138" ]
+   "template_args" : [ "type-139", "type-140", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8514,18 +8761,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-5", "type-138" ]
+   "template_args" : [ "type-139", "type-5", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8533,18 +8780,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-413", "type-1121" ]
+   "template_args" : [ "type-461", "type-417", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8552,18 +8799,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-439", "type-1121" ]
+   "template_args" : [ "type-461", "type-444", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8571,18 +8818,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-5", "type-1121" ]
+   "template_args" : [ "type-461", "type-5", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8590,18 +8837,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-214", "type-602" ]
+   "template_args" : [ "type-623", "type-219", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8609,18 +8856,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-5", "type-602" ]
+   "template_args" : [ "type-623", "type-5", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8628,12 +8875,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
-   "return_type" : "type-208",
+   "return_type" : "type-213",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-210", "type-43" ]
+   "template_args" : [ "type-215", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8641,12 +8888,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-375",
+   "return_type" : "type-372",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-133", "type-43" ]
+   "template_args" : [ "type-140", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8654,12 +8901,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
-   "return_type" : "type-212",
+   "return_type" : "type-217",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-214", "type-43" ]
+   "template_args" : [ "type-219", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8667,18 +8914,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-404", "type-384", "type-43", "type-43" ]
+   "template_args" : [ "type-421", "type-409", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8686,18 +8933,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-188", "type-43", "type-43" ]
+   "template_args" : [ "type-207", "type-193", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8705,18 +8952,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-138", "type-132", "type-43", "type-43" ]
+   "template_args" : [ "type-143", "type-139", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8724,18 +8971,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1121", "type-462", "type-43", "type-43" ]
+   "template_args" : [ "type-1173", "type-461", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8743,18 +8990,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-602", "type-593", "type-43", "type-43" ]
+   "template_args" : [ "type-632", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8762,31 +9009,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8796,8 +9043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8805,8 +9052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8814,8 +9061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-922",
+   "referenced_type" : "type-44",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8823,8 +9070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-917",
+   "referenced_type" : "type-54",
+   "self_type" : "type-959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8832,8 +9079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8841,8 +9088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-584",
-   "self_type" : "type-589",
+   "referenced_type" : "type-603",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8850,8 +9097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8859,8 +9106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-241",
-   "self_type" : "type-247",
+   "referenced_type" : "type-246",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8868,8 +9115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8877,8 +9124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-617",
-   "self_type" : "type-621",
+   "referenced_type" : "type-648",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8886,8 +9133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-561",
-   "self_type" : "type-580",
+   "referenced_type" : "type-552",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8895,8 +9142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-627",
+   "referenced_type" : "type-629",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8904,8 +9151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-243",
-   "self_type" : "type-550",
+   "referenced_type" : "type-248",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8913,8 +9160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8922,8 +9169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8931,8 +9178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8940,8 +9187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8949,8 +9196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8958,8 +9205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-942",
-   "self_type" : "type-941",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8967,8 +9214,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-697",
+   "referenced_type" : "type-483",
+   "self_type" : "type-751",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8976,8 +9232,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-857",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8985,8 +9241,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-848",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8994,8 +9250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-683",
+   "referenced_type" : "type-104",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9003,8 +9259,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-701",
+   "referenced_type" : "type-486",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-123",
+   "self_type" : "type-614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9012,8 +9277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-902",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9021,8 +9286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-829",
-   "self_type" : "type-834",
+   "referenced_type" : "type-871",
+   "self_type" : "type-876",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9031,7 +9296,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-80",
-   "self_type" : "type-1132",
+   "self_type" : "type-1183",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9039,8 +9304,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-467",
-   "self_type" : "type-647",
+   "referenced_type" : "type-482",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9048,8 +9322,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-856",
-   "self_type" : "type-867",
+   "referenced_type" : "type-898",
+   "self_type" : "type-909",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9057,8 +9331,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-847",
-   "self_type" : "type-855",
+   "referenced_type" : "type-889",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9066,8 +9340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-645",
+   "referenced_type" : "type-103",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9075,8 +9349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-380",
+   "referenced_type" : "type-372",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9084,8 +9358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-220",
+   "referenced_type" : "type-213",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9093,8 +9367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-414",
+   "referenced_type" : "type-217",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9102,8 +9376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-460",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9111,8 +9385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9120,8 +9394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-239",
+   "referenced_type" : "type-191",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9129,8 +9403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-407",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9138,8 +9412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9147,8 +9421,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-490",
-   "self_type" : "type-501",
+   "referenced_type" : "type-496",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9156,8 +9430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9165,8 +9439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-913",
-   "self_type" : "type-916",
+   "referenced_type" : "type-955",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9174,8 +9448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-985",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9183,8 +9457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-609",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9192,8 +9466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-537",
+   "referenced_type" : "type-537",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9201,8 +9475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9210,8 +9484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-167",
+   "referenced_type" : "type-162",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9219,8 +9493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9228,8 +9502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-464",
-   "self_type" : "type-578",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9237,8 +9511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-151",
-   "self_type" : "type-153",
+   "referenced_type" : "type-156",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9246,8 +9520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9255,8 +9529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9264,8 +9538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9273,8 +9547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9282,17 +9556,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-574",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9300,8 +9583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-898",
+   "referenced_type" : "type-939",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9309,8 +9592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
+   "referenced_type" : "type-874",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9318,8 +9601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-828",
+   "referenced_type" : "type-868",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9327,8 +9610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9336,8 +9619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-503",
+   "referenced_type" : "type-480",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9345,8 +9628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9354,8 +9637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9363,8 +9646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9372,17 +9655,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1260",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1089",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9390,8 +9682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-502",
+   "referenced_type" : "type-504",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9399,8 +9691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-874",
+   "referenced_type" : "type-914",
+   "self_type" : "type-916",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9408,8 +9700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
+   "referenced_type" : "type-917",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9417,8 +9709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-892",
-   "self_type" : "type-894",
+   "referenced_type" : "type-934",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9426,8 +9718,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-968",
-   "self_type" : "type-969",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9435,8 +9727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9444,7 +9736,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9453,8 +9745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-401",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-405",
+   "self_type" : "type-1268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9462,8 +9754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-228",
-   "self_type" : "type-229",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9471,8 +9763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-207",
-   "self_type" : "type-211",
+   "referenced_type" : "type-212",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9480,8 +9772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-217",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9489,8 +9781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-445",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9498,8 +9790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-234",
-   "self_type" : "type-235",
+   "referenced_type" : "type-239",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9507,8 +9799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9516,8 +9808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9525,8 +9817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9534,8 +9826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-191",
+   "referenced_type" : "type-190",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9543,8 +9835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-386",
+   "referenced_type" : "type-406",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9552,8 +9844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-590",
-   "self_type" : "type-594",
+   "referenced_type" : "type-620",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9561,8 +9853,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-507",
-   "self_type" : "type-810",
+   "referenced_type" : "type-515",
+   "self_type" : "type-852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9570,8 +9862,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-862",
-   "self_type" : "type-878",
+   "referenced_type" : "type-904",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9579,8 +9871,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-1164",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9588,8 +9880,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-364",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-369",
+   "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9597,8 +9889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1184",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9606,8 +9898,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-1147",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9615,8 +9907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-296",
-   "self_type" : "type-802",
+   "referenced_type" : "type-297",
+   "self_type" : "type-844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9624,8 +9916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-819",
+   "referenced_type" : "type-860",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9633,8 +9925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-816",
-   "self_type" : "type-817",
+   "referenced_type" : "type-858",
+   "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9642,59 +9934,59 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-999",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1043",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
+   "referenced_type" : "type-661",
+   "self_type" : "type-663",
    "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-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-841",
+   "referenced_type" : "type-881",
+   "self_type" : "type-883",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-484",
+   "referenced_type" : "type-391",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9702,8 +9994,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
+   "referenced_type" : "type-854",
+   "self_type" : "type-855",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9711,8 +10003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-806",
-   "self_type" : "type-807",
+   "referenced_type" : "type-848",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9720,8 +10012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-803",
-   "self_type" : "type-805",
+   "referenced_type" : "type-845",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9729,8 +10021,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-1222",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9738,8 +10030,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-275",
-   "self_type" : "type-277",
+   "referenced_type" : "type-282",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9747,8 +10039,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-504",
-   "self_type" : "type-508",
+   "referenced_type" : "type-525",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9756,8 +10048,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-687",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9765,8 +10057,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-946",
-   "self_type" : "type-948",
+   "referenced_type" : "type-988",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9774,8 +10066,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9783,8 +10075,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9792,8 +10084,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-182",
+   "referenced_type" : "type-188",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9801,8 +10093,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-402",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9810,8 +10102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-705",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9819,8 +10111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9828,8 +10120,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-885",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-927",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9837,8 +10129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-811",
+   "referenced_type" : "type-37",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9846,8 +10138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-815",
+   "referenced_type" : "type-856",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9855,8 +10147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-808",
-   "self_type" : "type-809",
+   "referenced_type" : "type-850",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9864,8 +10156,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-41",
-   "self_type" : "type-909",
+   "referenced_type" : "type-27",
+   "self_type" : "type-951",
    "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"
   },
@@ -9874,7 +10166,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1047",
+   "self_type" : "type-1098",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -9883,7 +10175,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1060",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -9894,8 +10186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -9903,8 +10195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1076",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9912,8 +10204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9921,8 +10213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9930,8 +10222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9939,8 +10231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9949,7 +10241,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-824",
+   "self_type" : "type-866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9957,8 +10249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9966,8 +10258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-250",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9975,8 +10267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9984,8 +10276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9993,8 +10285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10020,8 +10312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-821",
+   "referenced_type" : "type-862",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10029,8 +10321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10038,8 +10330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-923",
+   "referenced_type" : "type-44",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10047,8 +10339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-918",
+   "referenced_type" : "type-54",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10056,8 +10348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-296",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10065,8 +10357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-657",
+   "referenced_type" : "type-643",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10074,8 +10366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-510",
+   "referenced_type" : "type-200",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10083,8 +10375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10092,8 +10384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10101,8 +10393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-272",
+   "referenced_type" : "type-210",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10110,8 +10402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-498",
+   "referenced_type" : "type-424",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10119,17 +10411,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-651",
+   "referenced_type" : "type-635",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-991",
+   "self_type" : "type-1034",
+   "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-999",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-962",
-   "self_type" : "type-967",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10137,8 +10447,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-981",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10146,8 +10456,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-970",
-   "self_type" : "type-976",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10155,8 +10465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10164,8 +10474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10182,8 +10492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10191,8 +10501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-938",
+   "referenced_type" : "type-975",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10200,8 +10510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10209,8 +10519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10218,8 +10528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "type-603",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10227,8 +10537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10236,8 +10546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-245",
+   "referenced_type" : "type-246",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10245,8 +10555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10254,8 +10564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-618",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10263,8 +10573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-561",
-   "self_type" : "type-575",
+   "referenced_type" : "type-552",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10272,8 +10582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-624",
+   "referenced_type" : "type-629",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10281,17 +10591,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-523",
+   "referenced_type" : "type-248",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1032",
+   "self_type" : "type-1035",
+   "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-1036",
+   "self_type" : "type-1038",
+   "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-1039",
+   "self_type" : "type-1040",
+   "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-146",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-151",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10299,8 +10636,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-696",
+   "referenced_type" : "type-483",
+   "self_type" : "type-750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10308,8 +10654,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-857",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1185",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10317,8 +10663,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-848",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10326,8 +10672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-672",
+   "referenced_type" : "type-104",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10335,8 +10681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-606",
+   "referenced_type" : "type-247",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10344,8 +10690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1157",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10353,8 +10699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1097",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1150",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10362,8 +10708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-352",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10371,8 +10717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-338",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10380,8 +10726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
+   "referenced_type" : "type-338",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10389,8 +10735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10398,8 +10744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-376",
+   "referenced_type" : "type-140",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10407,8 +10753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-226",
+   "referenced_type" : "type-195",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10416,8 +10762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-215",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10425,8 +10771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-219",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10434,8 +10780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10443,8 +10789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10452,8 +10798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10461,8 +10807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10470,8 +10816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10479,8 +10825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-355",
+   "referenced_type" : "type-359",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10488,8 +10834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-563",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10498,7 +10844,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-74",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10533,8 +10879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10542,8 +10888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-232",
+   "referenced_type" : "type-194",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10551,8 +10897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-418",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10560,8 +10906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-986",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10569,8 +10915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10578,8 +10924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-197",
+   "referenced_type" : "type-197",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10587,8 +10933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-399",
+   "referenced_type" : "type-414",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10596,8 +10942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10605,8 +10951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10614,8 +10960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10623,8 +10969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-206",
+   "referenced_type" : "type-207",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10632,8 +10978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-404",
-   "self_type" : "type-409",
+   "referenced_type" : "type-421",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10641,8 +10987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "type-632",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10650,8 +10996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10659,8 +11005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10668,8 +11014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-201",
+   "referenced_type" : "type-203",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10677,8 +11023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10686,8 +11032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-601",
+   "referenced_type" : "type-630",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10695,8 +11041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10704,8 +11050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-139",
+   "self_type" : "type-1207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10713,8 +11059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "type-193",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10722,8 +11068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10731,17 +11077,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-123",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10749,8 +11104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10758,8 +11113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-491",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10767,8 +11122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-501",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10776,8 +11131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "referenced_type" : "type-871",
+   "self_type" : "type-872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10786,7 +11141,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-80",
-   "self_type" : "type-850",
+   "self_type" : "type-892",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10794,8 +11149,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-646",
+   "referenced_type" : "type-482",
+   "self_type" : "type-671",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10803,8 +11167,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-856",
-   "self_type" : "type-864",
+   "referenced_type" : "type-898",
+   "self_type" : "type-906",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10812,8 +11176,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-847",
-   "self_type" : "type-852",
+   "referenced_type" : "type-889",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10821,8 +11185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-370",
+   "referenced_type" : "type-103",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10830,8 +11194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-891",
+   "referenced_type" : "type-932",
+   "self_type" : "type-933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10839,8 +11203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-945",
+   "referenced_type" : "type-198",
+   "self_type" : "type-987",
    "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"
   },
@@ -10857,8 +11221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10866,8 +11230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10884,8 +11248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-29",
+   "referenced_type" : "type-16",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10893,8 +11257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-260",
+   "referenced_type" : "type-24",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10902,8 +11266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-416",
+   "referenced_type" : "type-415",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10911,8 +11275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10920,8 +11284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
+   "referenced_type" : "type-230",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10929,8 +11293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-219",
+   "referenced_type" : "type-213",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10938,8 +11302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10947,8 +11311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-440",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10956,8 +11320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10965,8 +11329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10974,8 +11338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10983,8 +11347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10992,8 +11356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-237",
+   "referenced_type" : "type-191",
+   "self_type" : "type-242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11001,8 +11365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-407",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11010,8 +11374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11019,8 +11383,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-490",
-   "self_type" : "type-489",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11028,8 +11392,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-194",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11037,8 +11401,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-265",
-   "self_type" : "type-278",
+   "referenced_type" : "type-268",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11046,8 +11410,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-352",
-   "self_type" : "type-363",
+   "referenced_type" : "type-335",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11055,8 +11419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-975",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11064,8 +11428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-625",
+   "referenced_type" : "type-528",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11073,8 +11437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-827",
+   "referenced_type" : "type-499",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11083,7 +11447,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1144",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11091,8 +11455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11100,8 +11464,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11109,8 +11473,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-609",
+   "referenced_type" : "type-57",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11118,8 +11482,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-905",
+   "referenced_type" : "type-946",
+   "self_type" : "type-947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11127,8 +11491,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-864",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11136,8 +11500,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-921",
+   "referenced_type" : "type-43",
+   "self_type" : "type-963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11145,8 +11509,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-915",
+   "referenced_type" : "type-955",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11154,8 +11518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11163,8 +11527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-925",
-   "self_type" : "type-926",
+   "referenced_type" : "type-967",
+   "self_type" : "type-968",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11172,8 +11536,8 @@
    "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-955",
-   "self_type" : "type-956",
+   "referenced_type" : "type-997",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11181,8 +11545,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-961",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1003",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11190,8 +11554,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11199,8 +11563,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11208,8 +11572,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11217,8 +11581,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-249",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11226,8 +11590,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11235,8 +11599,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-656",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11244,8 +11608,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-584",
+   "self_type" : "type-599",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11253,8 +11617,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-558",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11262,8 +11626,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-699",
+   "referenced_type" : "type-752",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11271,8 +11635,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11280,8 +11644,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-181",
+   "referenced_type" : "type-181",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11289,8 +11653,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
+   "referenced_type" : "type-125",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11298,8 +11662,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-175",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11307,8 +11671,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-171",
+   "referenced_type" : "type-175",
+   "self_type" : "type-176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11316,8 +11689,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11325,8 +11698,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-1129",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1182",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11334,8 +11707,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11343,8 +11716,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11352,8 +11725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11361,8 +11734,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-614",
+   "referenced_type" : "type-619",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11370,8 +11743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11379,8 +11752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11388,8 +11761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "referenced_type" : "type-357",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11397,8 +11770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11406,8 +11779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-336",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11415,8 +11788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11424,8 +11797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11433,8 +11806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-317",
+   "referenced_type" : "type-321",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11442,8 +11815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-223",
-   "self_type" : "type-224",
+   "referenced_type" : "type-228",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11451,8 +11824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-319",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11460,8 +11833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11469,8 +11842,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11478,8 +11851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11487,8 +11860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11496,8 +11869,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "type-590",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11505,8 +11878,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11514,8 +11887,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-323",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11523,8 +11896,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11532,8 +11905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11541,8 +11914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-150",
+   "referenced_type" : "type-142",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11550,8 +11923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11559,8 +11932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-569",
-   "self_type" : "type-570",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11568,8 +11941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-746",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11577,8 +11950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11586,8 +11959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-134",
+   "referenced_type" : "type-138",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11595,8 +11968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
+   "referenced_type" : "type-333",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11604,8 +11977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11613,17 +11986,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-692",
+   "referenced_type" : "type-743",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11631,8 +12013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11640,8 +12022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-836",
+   "referenced_type" : "type-874",
+   "self_type" : "type-878",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11649,8 +12031,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11658,8 +12040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-466",
+   "referenced_type" : "type-480",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11667,8 +12049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11676,8 +12058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11685,8 +12067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11694,8 +12076,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11703,8 +12094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11712,8 +12103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-914",
+   "self_type" : "type-915",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11721,8 +12112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-876",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11730,8 +12121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-892",
-   "self_type" : "type-893",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11739,8 +12130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1147",
    "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"
   },
@@ -11748,8 +12139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11757,8 +12148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-288",
+   "referenced_type" : "type-290",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11766,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1093",
    "size" : 4,
    "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"
   },
@@ -11775,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-49",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11784,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-264",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11793,7 +12184,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -11802,8 +12193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11811,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11820,8 +12211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-222",
+   "referenced_type" : "type-212",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11829,8 +12220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-218",
+   "referenced_type" : "type-221",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11838,8 +12229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-451",
+   "referenced_type" : "type-453",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11847,8 +12238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-236",
+   "referenced_type" : "type-239",
+   "self_type" : "type-241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11856,8 +12247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11865,8 +12256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11874,8 +12265,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11883,8 +12274,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-240",
+   "referenced_type" : "type-190",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11892,8 +12283,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-427",
+   "referenced_type" : "type-406",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11901,8 +12292,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-590",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11910,8 +12301,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-507",
-   "self_type" : "type-506",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11919,8 +12310,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-862",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11928,8 +12319,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-1164",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11937,8 +12328,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-283",
-   "self_type" : "type-286",
+   "referenced_type" : "type-281",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11946,8 +12337,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-364",
-   "self_type" : "type-371",
+   "referenced_type" : "type-369",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11955,8 +12346,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11964,8 +12355,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-838",
-   "self_type" : "type-851",
+   "referenced_type" : "type-880",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11973,8 +12364,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-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11982,8 +12373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11991,8 +12382,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12000,7 +12391,7 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-391",
    "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -12009,8 +12400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12018,8 +12409,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12027,8 +12418,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-814",
-   "self_type" : "type-939",
+   "referenced_type" : "type-856",
+   "self_type" : "type-981",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12036,8 +12427,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-896",
+   "referenced_type" : "type-937",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12045,8 +12436,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12054,8 +12445,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-871",
+   "referenced_type" : "type-27",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12063,8 +12454,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-582",
+   "referenced_type" : "type-392",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12072,8 +12463,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-644",
+   "referenced_type" : "type-170",
+   "self_type" : "type-654",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12082,7 +12473,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-90",
-   "self_type" : "type-104",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12091,7 +12482,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1221",
+   "self_type" : "type-1273",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12100,7 +12491,7 @@
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
    "referenced_type" : "type-83",
-   "self_type" : "type-935",
+   "self_type" : "type-977",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12108,8 +12499,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12117,8 +12508,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12126,8 +12517,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-42",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12139,8 +12530,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12149,8 +12540,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-250",
-   "self_type" : "type-252",
+   "referenced_type" : "type-255",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12159,8 +12550,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-441",
-   "self_type" : "type-443",
+   "referenced_type" : "type-456",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12169,8 +12560,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
+   "referenced_type" : "type-658",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12179,8 +12570,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-714",
-   "self_type" : "type-716",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12199,8 +12590,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-144",
+   "referenced_type" : "type-17",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12209,8 +12600,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-643",
-   "self_type" : "type-904",
+   "referenced_type" : "type-653",
+   "self_type" : "type-946",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12220,7 +12611,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-822",
+   "self_type" : "type-864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12229,8 +12620,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12239,8 +12630,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-913",
+   "referenced_type" : "type-54",
+   "self_type" : "type-955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12249,8 +12640,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-50",
-   "self_type" : "type-990",
+   "referenced_type" : "type-36",
+   "self_type" : "type-1041",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12259,8 +12650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-143",
-   "self_type" : "type-925",
+   "referenced_type" : "type-148",
+   "self_type" : "type-967",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12269,8 +12660,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-949",
-   "self_type" : "type-955",
+   "referenced_type" : "type-991",
+   "self_type" : "type-997",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12279,8 +12670,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-957",
-   "self_type" : "type-960",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1002",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12289,8 +12680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-933",
-   "self_type" : "type-943",
+   "referenced_type" : "type-975",
+   "self_type" : "type-985",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12299,8 +12690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1231",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12309,8 +12700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-584",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-607",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12319,8 +12710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1237",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12329,8 +12720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-241",
-   "self_type" : "type-248",
+   "referenced_type" : "type-246",
+   "self_type" : "type-253",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12339,8 +12730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12349,8 +12740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-617",
-   "self_type" : "type-622",
+   "referenced_type" : "type-648",
+   "self_type" : "type-656",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12359,8 +12750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-581",
+   "referenced_type" : "type-552",
+   "self_type" : "type-584",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12369,8 +12760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-526",
+   "referenced_type" : "type-248",
+   "self_type" : "type-537",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12379,8 +12770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-952",
-   "self_type" : "type-954",
+   "referenced_type" : "type-994",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12389,8 +12780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-698",
+   "referenced_type" : "type-483",
+   "self_type" : "type-752",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12399,8 +12790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12409,8 +12800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12420,7 +12811,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-135",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12430,7 +12821,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-76",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12440,7 +12831,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12449,8 +12850,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-857",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1187",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12459,8 +12860,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-848",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12469,8 +12870,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12479,8 +12880,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-869",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-911",
+   "self_type" : "type-1062",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12489,8 +12890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-104",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12499,8 +12900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-242",
-   "self_type" : "type-610",
+   "referenced_type" : "type-247",
+   "self_type" : "type-619",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12509,8 +12910,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1162",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12519,8 +12920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1154",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12529,8 +12930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-354",
+   "self_type" : "type-357",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12539,8 +12940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-350",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12549,8 +12950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-343",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12559,8 +12960,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1118",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12569,8 +12970,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12579,8 +12980,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12589,8 +12990,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-417",
+   "self_type" : "type-1134",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12599,8 +13000,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-408",
+   "referenced_type" : "type-140",
+   "self_type" : "type-411",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12609,8 +13010,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-316",
+   "referenced_type" : "type-195",
+   "self_type" : "type-321",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12619,8 +13020,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-223",
+   "referenced_type" : "type-215",
+   "self_type" : "type-228",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12629,8 +13030,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-314",
+   "referenced_type" : "type-219",
+   "self_type" : "type-319",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12639,8 +13040,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12649,8 +13050,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-703",
+   "referenced_type" : "type-486",
+   "self_type" : "type-756",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12659,8 +13060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-487",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12669,8 +13070,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12679,8 +13080,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-464",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12689,8 +13090,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12699,8 +13100,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-157",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12709,8 +13110,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12719,8 +13120,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12729,8 +13130,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-185",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12739,8 +13140,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1169",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -12749,8 +13150,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-359",
+   "referenced_type" : "type-361",
+   "self_type" : "type-365",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -12759,8 +13160,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-567",
+   "referenced_type" : "type-587",
+   "self_type" : "type-590",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -12770,7 +13171,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-88",
-   "self_type" : "type-112",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12780,7 +13181,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-79",
-   "self_type" : "type-173",
+   "self_type" : "type-178",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12790,7 +13191,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-96",
-   "self_type" : "type-169",
+   "self_type" : "type-174",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12800,7 +13201,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-89",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12810,7 +13211,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-97",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12819,8 +13220,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-444",
+   "self_type" : "type-1136",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -12829,8 +13230,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-318",
+   "referenced_type" : "type-194",
+   "self_type" : "type-323",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -12839,8 +13240,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-549",
+   "referenced_type" : "type-410",
+   "self_type" : "type-570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -12850,7 +13251,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12859,8 +13260,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-573",
+   "referenced_type" : "type-102",
+   "self_type" : "type-597",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12869,8 +13270,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12879,8 +13280,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -12889,8 +13290,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-142",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12899,8 +13300,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-361",
+   "referenced_type" : "type-207",
+   "self_type" : "type-367",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -12909,8 +13310,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-569",
+   "referenced_type" : "type-421",
+   "self_type" : "type-593",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12919,8 +13320,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-694",
+   "referenced_type" : "type-632",
+   "self_type" : "type-746",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -12930,7 +13331,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -12939,8 +13340,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-461",
+   "self_type" : "type-1138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -12949,8 +13350,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-139",
+   "self_type" : "type-138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -12959,8 +13360,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-328",
+   "referenced_type" : "type-193",
+   "self_type" : "type-333",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -12969,8 +13370,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-409",
+   "self_type" : "type-581",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -12979,18 +13380,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-690",
+   "referenced_type" : "type-623",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-119",
-   "self_type" : "type-122",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13000,7 +13421,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13009,8 +13430,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1177",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13019,8 +13440,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-501",
+   "self_type" : "type-1200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13029,8 +13450,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-897",
+   "referenced_type" : "type-165",
+   "self_type" : "type-939",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13039,8 +13460,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-832",
+   "referenced_type" : "type-871",
+   "self_type" : "type-874",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13050,7 +13471,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-80",
-   "self_type" : "type-826",
+   "self_type" : "type-868",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13059,8 +13480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-571",
+   "referenced_type" : "type-482",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13069,8 +13490,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-465",
+   "referenced_type" : "type-473",
+   "self_type" : "type-480",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13079,8 +13500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13090,7 +13511,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-84",
-   "self_type" : "type-1203",
+   "self_type" : "type-1254",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13100,7 +13521,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-75",
-   "self_type" : "type-1209",
+   "self_type" : "type-1261",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13110,7 +13531,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-92",
-   "self_type" : "type-1206",
+   "self_type" : "type-1257",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13119,8 +13550,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-847",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-889",
+   "self_type" : "type-1140",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13129,8 +13560,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13139,8 +13570,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-872",
+   "referenced_type" : "type-910",
+   "self_type" : "type-914",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13149,8 +13580,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-875",
+   "referenced_type" : "type-103",
+   "self_type" : "type-917",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13159,8 +13590,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13169,8 +13600,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-1092",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1146",
    "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"
   },
@@ -13179,8 +13610,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-907",
-   "self_type" : "type-908",
+   "referenced_type" : "type-949",
+   "self_type" : "type-950",
    "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"
   },
@@ -13190,7 +13621,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-966",
+   "self_type" : "type-1008",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13199,8 +13630,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-965",
-   "self_type" : "type-968",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1010",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13209,8 +13640,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-267",
-   "self_type" : "type-287",
+   "referenced_type" : "type-270",
+   "self_type" : "type-290",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13219,8 +13650,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-1044",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1099",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13229,8 +13660,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-1043",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1097",
    "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"
   },
@@ -13239,8 +13670,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-354",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-337",
+   "self_type" : "type-1092",
    "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"
   },
@@ -13249,8 +13680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13259,8 +13690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13269,8 +13700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-420",
+   "referenced_type" : "type-415",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13279,8 +13710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-401",
+   "referenced_type" : "type-372",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13289,8 +13720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13299,8 +13730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "type-213",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13309,8 +13740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-217",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13319,8 +13750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-444",
+   "referenced_type" : "type-442",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13329,8 +13760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-231",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13339,8 +13770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13349,8 +13780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-486",
+   "referenced_type" : "type-459",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13359,8 +13790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13369,8 +13800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "type-191",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13379,8 +13810,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13389,8 +13820,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13399,8 +13830,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-490",
-   "self_type" : "type-507",
+   "referenced_type" : "type-496",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13409,8 +13840,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-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-905",
+   "self_type" : "type-904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13419,8 +13850,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-194",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13429,8 +13860,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-265",
-   "self_type" : "type-283",
+   "referenced_type" : "type-268",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13439,8 +13870,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-352",
-   "self_type" : "type-364",
+   "referenced_type" : "type-335",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13449,8 +13880,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13459,8 +13890,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-493",
-   "self_type" : "type-838",
+   "referenced_type" : "type-499",
+   "self_type" : "type-880",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13470,7 +13901,7 @@
    "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-3",
-   "self_type" : "type-1147",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13479,8 +13910,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-296",
+   "referenced_type" : "type-39",
+   "self_type" : "type-297",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13489,8 +13920,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13499,8 +13930,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13510,7 +13941,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-91",
-   "self_type" : "type-818",
+   "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13519,8 +13950,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-792",
-   "self_type" : "type-816",
+   "referenced_type" : "type-834",
+   "self_type" : "type-858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13529,8 +13960,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-999",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13538,48 +13969,48 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "source_file" : "/system/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-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13587,8 +14018,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13597,8 +14028,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-812",
+   "referenced_type" : "type-32",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13607,8 +14038,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13617,8 +14048,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-806",
+   "referenced_type" : "type-730",
+   "self_type" : "type-848",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13627,8 +14058,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13637,8 +14068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13647,8 +14078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13657,8 +14088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-560",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13667,8 +14098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13677,8 +14108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13687,8 +14118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13697,8 +14128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13707,8 +14138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13717,8 +14148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13727,8 +14158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13737,8 +14168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13747,8 +14178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13757,8 +14188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13767,8 +14198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-312",
+   "self_type" : "type-311",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13777,8 +14208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13787,8 +14218,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13797,8 +14228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13807,8 +14238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13817,8 +14248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13827,8 +14258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13837,8 +14268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13847,8 +14278,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13857,8 +14288,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13867,8 +14298,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-742",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13877,8 +14308,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13887,8 +14318,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13897,8 +14328,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13907,8 +14338,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13917,8 +14348,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13927,8 +14358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13937,8 +14368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13947,8 +14378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13957,8 +14388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13967,8 +14398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13977,8 +14408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13987,8 +14418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13997,8 +14428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14007,8 +14438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14017,8 +14448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14027,8 +14458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "type-61",
+   "self_type" : "type-60",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14037,8 +14468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14047,8 +14478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14057,8 +14488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14067,8 +14498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14077,8 +14508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-562",
+   "self_type" : "type-561",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14087,8 +14518,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14107,8 +14548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14117,8 +14558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14127,8 +14568,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14147,8 +14598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14157,8 +14608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-545",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14167,8 +14618,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14187,8 +14648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-332",
+   "self_type" : "type-331",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14197,8 +14658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14207,8 +14668,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14217,38 +14688,88 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-137",
+   "self_type" : "type-136",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-130",
    "self_type" : "type-129",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14257,8 +14778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14267,8 +14788,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14277,8 +14808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14287,8 +14818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14297,8 +14828,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14307,8 +14848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1265",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14317,8 +14858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14327,8 +14868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14337,8 +14878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-680",
+   "self_type" : "type-679",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14347,8 +14888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14357,8 +14898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14367,8 +14908,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-1052",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14377,8 +14918,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-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14387,8 +14928,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-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14397,8 +14938,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-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14407,8 +14948,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-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-707",
+   "self_type" : "type-706",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14417,8 +14958,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-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14427,8 +14968,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-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14437,8 +14978,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-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14447,8 +14988,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-520",
-   "self_type" : "type-519",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14457,8 +14998,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-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-705",
+   "self_type" : "type-704",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14467,8 +15008,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-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14477,8 +15018,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-276",
-   "self_type" : "type-275",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14487,8 +15028,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-505",
-   "self_type" : "type-504",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14497,8 +15038,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-688",
+   "self_type" : "type-687",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14507,8 +15048,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-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14517,8 +15058,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-1197",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14527,8 +15068,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-259",
-   "self_type" : "type-258",
+   "referenced_type" : "type-265",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14537,8 +15078,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-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14547,8 +15088,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-640",
-   "self_type" : "type-639",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14557,8 +15098,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-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14567,8 +15108,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-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14577,8 +15118,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-262",
+   "self_type" : "type-261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14587,8 +15128,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14597,8 +15138,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-638",
-   "self_type" : "type-637",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14607,8 +15148,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-854",
-   "self_type" : "type-853",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14617,8 +15158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14627,8 +15168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14637,8 +15178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14647,8 +15188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14657,8 +15198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14667,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14678,7 +15219,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-90",
-   "self_type" : "type-885",
+   "self_type" : "type-927",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14688,7 +15229,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-51",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14698,7 +15239,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-83",
-   "self_type" : "type-814",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14707,8 +15248,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-808",
+   "referenced_type" : "type-396",
+   "self_type" : "type-850",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14716,8 +15257,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-895",
+   "referenced_type" : "type-29",
+   "self_type" : "type-937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -14725,8 +15266,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-39",
+   "self_type" : "type-300",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -14735,8 +15276,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-58",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -14750,14 +15291,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -14769,17 +15310,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-51"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-44", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -14789,37 +15330,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
+     "referenced_type" : "type-652"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
+   "name" : "android::LightRefBase<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-653" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
      "referenced_type" : "type-642"
     }
    ],
-   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
-   "name" : "android::LightRefBase<android::NativeHandle>",
+   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
+   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
    "referenced_type" : "type-641",
    "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "template_args" : [ "type-643" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-633" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -14829,14 +15370,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-34"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -14848,14 +15389,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1026"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -14865,7 +15406,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-651"
     }
    ],
    "fields" :
@@ -14874,20 +15415,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -14899,14 +15440,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1083"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -14918,14 +15459,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -14937,14 +15478,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -15015,8 +15556,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -15026,8 +15567,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -15059,8 +15600,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -15071,17 +15612,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-52"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -15128,14 +15669,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -15193,14 +15734,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-45"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -15212,14 +15753,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -15239,62 +15780,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-297"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -15384,17 +15925,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -15441,7 +15982,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
@@ -15453,20 +15994,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -15518,14 +16059,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-641"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-643",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -15553,7 +16094,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -15562,32 +16103,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -15703,7 +16244,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     },
     {
      "access" : "private",
@@ -15715,14 +16256,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -15810,23 +16351,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -15999,23 +16540,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -16200,23 +16741,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -16393,23 +16934,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -16686,23 +17227,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -16879,23 +17420,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17068,23 +17609,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17261,23 +17802,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -17594,23 +18135,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-932",
-   "self_type" : "type-932",
+   "referenced_type" : "type-974",
+   "self_type" : "type-974",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17783,23 +18324,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17988,23 +18529,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18185,23 +18726,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18438,6 +18979,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -18546,23 +19091,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-635",
+   "self_type" : "type-635",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18635,6 +19180,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -18746,17 +19295,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -18926,23 +19475,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-950"
+     "referenced_type" : "type-992"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-993"
     }
    ],
    "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-949",
-   "self_type" : "type-949",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-952" ],
+   "template_args" : [ "type-3", "type-994" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -18952,23 +19501,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-958"
+     "referenced_type" : "type-1000"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-1001"
     }
    ],
    "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-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-39" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -18978,23 +19527,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-1005"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-964"
+     "referenced_type" : "type-1006"
     }
    ],
    "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-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1004",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-965", "type-889" ],
+   "template_args" : [ "type-1007", "type-931" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19004,23 +19553,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-982"
+     "referenced_type" : "type-1024"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1025"
     }
    ],
    "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-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-984", "type-985" ],
+   "template_args" : [ "type-1026", "type-1027" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19030,23 +19579,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-1013"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-1014"
     }
    ],
    "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-970",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-973", "type-974" ],
+   "template_args" : [ "type-1015", "type-1016" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19075,8 +19624,8 @@
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -19087,7 +19636,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-829"
+     "referenced_type" : "type-871"
     },
     {
      "is_virtual" : true,
@@ -19097,8 +19646,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-879",
+   "self_type" : "type-879",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19185,8 +19734,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -19390,8 +19939,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -19473,13 +20022,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-842"
+     "referenced_type" : "type-884"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-943"
     },
     {
      "access" : "private",
@@ -19496,11 +20045,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-942",
+   "self_type" : "type-942",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19516,19 +20065,19 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-976"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
@@ -19552,7 +20101,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-977"
     },
     {
      "access" : "private",
@@ -19582,38 +20131,38 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 448,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 456,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 464,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-978"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -19640,8 +20189,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-940",
-   "self_type" : "type-940",
+   "referenced_type" : "type-982",
+   "self_type" : "type-982",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -19661,25 +20210,25 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
@@ -19697,86 +20246,86 @@
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-35"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 480,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-40"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-54"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 768,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 776,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -19854,7 +20403,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -19864,8 +20413,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -19875,7 +20424,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19884,17 +20433,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1104" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -19902,7 +20451,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19911,17 +20460,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-460" ],
+   "template_args" : [ "type-459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -19929,7 +20478,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19938,17 +20487,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1155" ],
+   "template_args" : [ "type-1206" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -19956,7 +20505,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19965,17 +20514,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-186" ],
+   "template_args" : [ "type-191" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -19983,7 +20532,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19992,17 +20541,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-407" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -20010,7 +20559,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -20019,17 +20568,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-591" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -20037,7 +20586,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -20046,17 +20595,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20064,17 +20613,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20084,26 +20633,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -20113,34 +20662,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1032",
+   "self_type" : "type-1032",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-991" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1036",
+   "self_type" : "type-1036",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-999" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1039",
+   "self_type" : "type-1039",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1004" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20169,18 +20778,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20192,14 +20801,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20208,8 +20817,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20218,8 +20827,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20228,8 +20837,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20249,8 +20858,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-86",
    "self_type" : "type-86",
@@ -20265,7 +20874,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
@@ -20273,11 +20882,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -20289,7 +20898,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "_pad",
@@ -20297,11 +20906,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-886",
+   "self_type" : "type-886",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -20313,7 +20922,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -20321,11 +20930,35 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-485"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-83"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -20337,7 +20970,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
@@ -20345,11 +20978,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -20369,8 +21002,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-77",
    "self_type" : "type-77",
@@ -20385,7 +21018,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "_pad",
@@ -20393,11 +21026,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -20409,7 +21042,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     },
     {
      "field_name" : "_pad",
@@ -20417,11 +21050,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -20441,8 +21074,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-94",
    "self_type" : "type-94",
@@ -20456,16 +21089,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -20474,16 +21107,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -20492,16 +21125,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -20510,16 +21143,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -20528,16 +21161,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -20600,13 +21233,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-74" ],
@@ -20618,16 +21251,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-858"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-900"
     }
    ],
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-899",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -20636,13 +21287,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-891"
     }
    ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-890",
+   "self_type" : "type-890",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-80" ],
@@ -20654,16 +21305,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -20672,16 +21323,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-923"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20691,7 +21342,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-609"
+     "referenced_type" : "type-615"
     },
     {
      "field_name" : "_pad",
@@ -20699,11 +21350,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-923",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20723,7 +21374,7 @@
    "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20733,7 +21384,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
      "field_name" : "_pad",
@@ -20741,8 +21392,8 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-82",
    "self_type" : "type-82",
@@ -20756,16 +21407,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20775,7 +21426,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "_pad",
@@ -20783,11 +21434,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20799,7 +21450,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-901"
     },
     {
      "field_name" : "_pad",
@@ -20807,11 +21458,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -20823,7 +21474,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-850"
+     "referenced_type" : "type-892"
     },
     {
      "field_name" : "_pad",
@@ -20831,11 +21482,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20847,7 +21498,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
@@ -20855,11 +21506,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -20870,16 +21521,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-912"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -20889,7 +21540,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-871"
+     "referenced_type" : "type-913"
     },
     {
      "field_name" : "_pad",
@@ -20897,11 +21548,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-912",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20912,16 +21563,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-943",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -20931,7 +21582,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "field_name" : "_pad",
@@ -20939,11 +21590,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20954,13 +21605,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-90" ],
@@ -20973,7 +21624,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "_pad",
@@ -20981,11 +21632,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -20994,8 +21645,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -21007,20 +21658,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -21029,8 +21680,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-924",
+   "self_type" : "type-924",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -21040,8 +21691,8 @@
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-925",
+   "self_type" : "type-925",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -21052,7 +21703,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21061,13 +21712,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -21189,7 +21840,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21198,13 +21849,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1097",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -21326,7 +21977,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21335,13 +21986,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -21463,7 +22114,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21472,13 +22123,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -21600,7 +22251,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21609,13 +22260,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -21737,10 +22388,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-971"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -21749,19 +22400,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1108"
+     "referenced_type" : "type-1159"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1109"
+     "referenced_type" : "type-1160"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -21950,10 +22601,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-970"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -21962,19 +22613,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1152"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1153"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -22172,10 +22823,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22184,19 +22835,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -22388,10 +23039,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22400,19 +23051,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -22679,10 +23330,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22691,19 +23342,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-341"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -22896,23 +23547,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-164"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-160"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -22927,8 +23578,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -23050,8 +23701,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -23185,8 +23836,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -23312,8 +23963,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -23539,8 +24190,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -23662,18 +24313,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -23694,8 +24345,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -23716,8 +24367,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -23728,13 +24379,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -23760,8 +24411,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -23782,8 +24433,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -23793,7 +24444,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23802,13 +24453,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -23930,7 +24581,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23939,13 +24590,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -24067,7 +24718,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -24076,13 +24727,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -24204,10 +24855,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24216,19 +24867,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1115"
+     "referenced_type" : "type-1167"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1116"
+     "referenced_type" : "type-1168"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -24417,10 +25068,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24429,19 +25080,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -24633,10 +25284,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24645,19 +25296,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -24982,7 +25633,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -25046,7 +25697,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -25072,13 +25723,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -25195,13 +25846,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -25322,13 +25973,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -25590,13 +26241,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -25606,7 +26257,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25615,13 +26266,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1028",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -25743,7 +26394,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25752,13 +26403,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -25880,7 +26531,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25889,13 +26540,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -26017,7 +26668,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26026,13 +26677,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -26154,7 +26805,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26163,13 +26814,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -26291,10 +26942,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26303,19 +26954,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1122"
+     "referenced_type" : "type-1174"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1123"
+     "referenced_type" : "type-1175"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -26504,10 +27155,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26516,19 +27167,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -26729,10 +27380,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26741,19 +27392,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-208"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -26948,10 +27599,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26960,19 +27611,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-422"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -27166,6 +27817,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -27290,10 +27944,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27302,19 +27956,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-603"
+     "referenced_type" : "type-633"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -27385,6 +28039,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -27509,10 +28166,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27521,19 +28178,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1220",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -27664,10 +28321,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27676,19 +28333,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -27831,10 +28488,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27843,19 +28500,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -27992,10 +28649,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28004,19 +28661,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -28210,6 +28867,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -28276,10 +28936,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28288,19 +28948,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -28371,6 +29031,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -28437,13 +29100,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -28560,13 +29223,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -28699,13 +29362,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -28830,13 +29493,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -29075,6 +29738,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29125,13 +29792,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -29206,6 +29873,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29252,19 +29923,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-103"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-122"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -29277,13 +29970,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-903"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-902",
+   "self_type" : "type-902",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -29303,7 +29996,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
@@ -29320,8 +30013,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -29406,8 +30099,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -29489,19 +30182,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -29513,7 +30206,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "access" : "private",
@@ -29530,8 +30223,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-871",
+   "self_type" : "type-871",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -29555,7 +30248,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -29573,7 +30266,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-885"
     },
     {
      "access" : "private",
@@ -29585,16 +30278,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-884",
+   "self_type" : "type-884",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -29604,7 +30297,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-483"
     },
     {
      "access" : "private",
@@ -29616,16 +30309,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -29635,7 +30328,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -29647,16 +30340,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -29666,7 +30359,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-491"
     },
     {
      "access" : "private",
@@ -29678,16 +30371,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -29697,7 +30390,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
@@ -29709,16 +30402,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1249",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -29740,7 +30433,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -29771,7 +30464,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -29802,7 +30495,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -29821,7 +30514,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -29833,13 +30526,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-74" ],
@@ -29852,7 +30545,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -29864,16 +30557,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-899"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-39"
     }
    ],
    "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-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-898",
+   "self_type" : "type-898",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -29883,7 +30607,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-890"
     },
     {
      "access" : "private",
@@ -29895,13 +30619,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-80" ],
@@ -29914,7 +30638,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -29926,16 +30650,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -29945,7 +30669,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-922"
     },
     {
      "access" : "private",
@@ -29957,16 +30681,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -29976,7 +30700,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-911"
     },
     {
      "access" : "private",
@@ -29988,16 +30712,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -30007,7 +30731,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30019,13 +30743,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30038,19 +30762,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -30060,10 +30784,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -30072,13 +30796,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -30200,10 +30924,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-969"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -30212,19 +30936,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1093"
+     "referenced_type" : "type-1144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1094"
+     "referenced_type" : "type-1145"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "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",
@@ -30408,7 +31132,7 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
@@ -30418,13 +31142,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-948",
+   "self_type" : "type-948",
    "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"
@@ -30555,8 +31279,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "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",
@@ -30708,23 +31432,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-910"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1096",
    "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"
@@ -30739,8 +31463,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "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",
@@ -30855,17 +31579,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-295"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-296" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -30875,17 +31599,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -30915,17 +31639,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -30935,17 +31659,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -30955,17 +31679,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-40" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -30975,17 +31699,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -30995,17 +31719,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -31015,17 +31739,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -31035,17 +31759,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -31055,17 +31779,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -31075,17 +31799,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-443"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-442",
+   "self_type" : "type-442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -31095,17 +31819,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -31115,17 +31839,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -31135,17 +31859,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -31155,17 +31879,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -31175,17 +31899,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -31195,17 +31919,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -31215,17 +31939,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -31235,17 +31959,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-491"
+     "referenced_type" : "type-497"
     }
    ],
    "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-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -31255,17 +31979,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-905",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -31281,8 +32005,8 @@
    "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-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -31295,17 +32019,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-269"
     }
    ],
    "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-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-267" ],
+   "template_args" : [ "type-270" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -31315,47 +32039,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-336"
     }
    ],
    "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-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-354" ],
+   "template_args" : [ "type-337" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31365,63 +32089,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31431,8 +32155,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31442,8 +32166,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31453,63 +32177,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31519,63 +32243,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31585,8 +32309,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31596,8 +32320,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31607,33 +32331,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -31644,26 +32368,26 @@
    "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31673,63 +32397,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-708",
+   "self_type" : "type-708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31739,8 +32463,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31750,8 +32474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31761,85 +32485,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "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-924",
-   "self_type" : "type-924",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-44" ],
    "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-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-54" ],
    "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-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31849,63 +32573,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31915,8 +32639,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31926,8 +32650,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31937,33 +32661,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -31973,7 +32697,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     },
     {
      "access" : "private",
@@ -31985,11 +32709,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32011,8 +32735,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -32025,7 +32749,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
@@ -32037,11 +32761,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32076,18 +32800,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -32103,18 +32827,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1009"
+     "referenced_type" : "type-1060"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1068"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -32125,7 +32849,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1064"
     },
     {
      "field_name" : "num_planes",
@@ -32135,13 +32859,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-1066"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -32152,48 +32876,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1061"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -32204,38 +32928,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -32246,18 +32970,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -32268,17 +32992,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
@@ -32298,13 +33022,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1009"
+     "referenced_type" : "type-1060"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32314,13 +33038,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -32331,35 +33055,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-394"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v3",
      "referenced_type" : "type-395"
     },
     {
+     "field_name" : "entry_v4",
+     "referenced_type" : "type-395"
+    },
+    {
+     "field_name" : "entry_v3",
+     "referenced_type" : "type-398"
+    },
+    {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-400"
     }
    ],
    "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-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "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)"
@@ -32380,8 +33104,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -32392,43 +33116,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -32439,32 +33163,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -32474,13 +33198,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -32491,32 +33215,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -32526,13 +33250,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -32543,17 +33267,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -32583,13 +33307,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -32600,28 +33324,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-166"
+     "referenced_type" : "type-171"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -32633,8 +33357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32642,8 +33366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-584",
-   "self_type" : "type-586",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32651,8 +33375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32660,8 +33384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-241",
-   "self_type" : "type-246",
+   "referenced_type" : "type-246",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32669,8 +33393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-430",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32678,8 +33402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-617",
-   "self_type" : "type-619",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32687,8 +33411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-561",
-   "self_type" : "type-579",
+   "referenced_type" : "type-552",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32696,8 +33420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-620",
-   "self_type" : "type-626",
+   "referenced_type" : "type-629",
+   "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32705,8 +33429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-540",
+   "referenced_type" : "type-248",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32714,8 +33438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-608",
+   "referenced_type" : "type-247",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32723,8 +33447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-160",
-   "self_type" : "type-831",
+   "referenced_type" : "type-165",
+   "self_type" : "type-873",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32732,8 +33456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-829",
-   "self_type" : "type-835",
+   "referenced_type" : "type-871",
+   "self_type" : "type-877",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32741,8 +33465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-375",
-   "self_type" : "type-387",
+   "referenced_type" : "type-372",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32750,8 +33474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-208",
-   "self_type" : "type-221",
+   "referenced_type" : "type-213",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32759,8 +33483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-212",
-   "self_type" : "type-415",
+   "referenced_type" : "type-217",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32768,8 +33492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-460",
-   "self_type" : "type-473",
+   "referenced_type" : "type-459",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32777,8 +33501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32786,8 +33510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-186",
-   "self_type" : "type-238",
+   "referenced_type" : "type-191",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32795,8 +33519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-407",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32804,8 +33528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-591",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32813,8 +33537,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-496",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32822,8 +33546,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-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32831,8 +33555,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-280",
-   "self_type" : "type-279",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32840,8 +33564,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-512",
-   "self_type" : "type-511",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32849,8 +33573,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32858,8 +33582,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-978",
-   "self_type" : "type-977",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32867,8 +33591,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32876,8 +33600,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32885,8 +33609,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32894,8 +33618,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32903,8 +33627,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
+   "referenced_type" : "type-697",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32912,8 +33636,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32921,8 +33645,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32930,8 +33654,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32939,8 +33663,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32948,8 +33672,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-980",
-   "self_type" : "type-979",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }

diff --git a/Q/64/arm64_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump b/Q/64/arm64_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump
index 7f3ae35..7809f23 100644
--- a/Q/64/arm64_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-396",
+   "referenced_type" : "type-59",
+   "self_type" : "type-398",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [64]",
+   "name" : "char [64]",
+   "referenced_type" : "type-59",
+   "self_type" : "type-1034",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-793",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1069",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-167",
+   "referenced_type" : "type-27",
+   "self_type" : "type-172",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-91",
-   "self_type" : "type-887",
+   "self_type" : "type-929",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-91",
-   "self_type" : "type-861",
+   "self_type" : "type-903",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-91",
-   "self_type" : "type-393",
+   "self_type" : "type-395",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1010",
+   "self_type" : "type-1061",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1
   },
   {
@@ -79,8 +88,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 1
   },
   {
@@ -89,8 +98,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 2
   },
   {
@@ -105,8 +114,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 4
   },
   {
@@ -114,8 +123,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -123,8 +132,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 8
   },
   {
@@ -132,8 +141,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 8
   },
   {
@@ -141,8 +150,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-735",
+   "self_type" : "type-735",
    "size" : 2
   },
   {
@@ -150,8 +159,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1
   },
   {
@@ -180,8 +189,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -190,8 +199,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 8
   },
   {
@@ -200,15 +209,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -352,6 +361,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -475,6 +487,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -526,6 +541,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -994,6 +1012,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1033,6 +1054,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1048,6 +1072,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1066,6 +1093,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEmm"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEmm"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1602,8 +1635,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1620,8 +1653,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1638,8 +1671,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-954",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1664,11 +1697,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1694,11 +1727,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1716,8 +1749,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-941",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1742,11 +1775,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1796,11 +1829,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1850,8 +1883,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1872,8 +1905,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1906,8 +1939,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1936,8 +1969,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1970,8 +2003,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-488",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1996,8 +2029,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2026,8 +2059,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2092,8 +2125,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2198,8 +2231,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::KeyRequestType",
    "name" : "android::hardware::drm::V1_1::KeyRequestType",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2236,8 +2269,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2295,6 +2328,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2416,11 +2487,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "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-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2434,11 +2505,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/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-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2460,8 +2531,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "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-91",
@@ -2564,8 +2635,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2590,8 +2661,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2632,8 +2703,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2874,8 +2945,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2904,8 +2975,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2934,8 +3005,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -2976,8 +3047,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3014,8 +3085,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3040,8 +3111,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3058,8 +3129,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3088,8 +3159,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3182,8 +3253,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3224,8 +3295,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3242,8 +3313,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3272,8 +3343,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3306,8 +3377,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3360,8 +3431,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3377,18 +3448,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-43",
+   "return_type" : "type-41",
+   "self_type" : "type-43",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3398,12 +3469,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1022",
-   "return_type" : "type-39",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1074",
+   "return_type" : "type-27",
+   "self_type" : "type-1074",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3413,27 +3484,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-981"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-937",
-   "return_type" : "type-41",
-   "self_type" : "type-937",
+   "referenced_type" : "type-979",
+   "return_type" : "type-29",
+   "self_type" : "type-979",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3446,14 +3517,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-408",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3463,16 +3534,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3482,13 +3553,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1286"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3498,13 +3569,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1236"
+     "referenced_type" : "type-1287"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3514,14 +3585,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-408",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3531,13 +3602,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3547,13 +3618,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1288"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3563,14 +3634,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3580,13 +3651,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1289"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3596,10 +3667,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3609,10 +3680,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3621,13 +3692,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3637,10 +3708,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3650,16 +3721,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3668,14 +3739,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3684,14 +3755,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3700,14 +3771,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3716,14 +3787,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3734,13 +3805,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-404"
+     "referenced_type" : "type-421"
     },
     {
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-1294"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3750,13 +3821,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-404"
+     "referenced_type" : "type-421"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-407"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3766,13 +3837,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-404"
+     "referenced_type" : "type-421"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-407"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3782,14 +3853,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-187",
+   "return_type" : "type-192",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3799,16 +3870,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3818,13 +3889,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1322"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3834,13 +3905,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1323"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3850,14 +3921,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-187",
+   "return_type" : "type-192",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3867,13 +3938,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3883,13 +3954,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1273"
+     "referenced_type" : "type-1324"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3899,14 +3970,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3916,13 +3987,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1274"
+     "referenced_type" : "type-1325"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3932,10 +4003,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3945,10 +4016,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3957,13 +4028,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3973,10 +4044,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3986,16 +4057,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4004,14 +4075,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-235"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4020,14 +4091,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-241"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4036,14 +4107,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4052,14 +4123,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-192"
+     "referenced_type" : "type-197"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4070,13 +4141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-207"
     },
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1329"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4086,13 +4157,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-207"
     },
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4102,13 +4173,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-207"
     },
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4118,16 +4189,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -4135,10 +4206,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1332"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4149,13 +4220,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1333"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4164,19 +4235,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1283"
+     "referenced_type" : "type-1334"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4185,19 +4256,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1284"
+     "referenced_type" : "type-1335"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-988"
+    },
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1336"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4206,19 +4298,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1285"
+     "referenced_type" : "type-1337"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4227,19 +4319,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1286"
+     "referenced_type" : "type-1338"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4248,19 +4340,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1287"
+     "referenced_type" : "type-1339"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4269,19 +4361,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-1340"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4290,19 +4382,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1289"
+     "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4313,10 +4405,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4326,13 +4418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4342,13 +4434,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4358,10 +4450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4371,10 +4463,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4384,10 +4476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4397,13 +4489,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-1342"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4413,13 +4505,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4429,16 +4521,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4448,13 +4540,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1343"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4464,16 +4556,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4483,13 +4575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-223"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4499,13 +4591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4515,13 +4607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1292"
+     "referenced_type" : "type-1344"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4531,13 +4623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4547,13 +4639,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1294"
+     "referenced_type" : "type-1346"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4563,28 +4655,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1295"
+     "referenced_type" : "type-1347"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4594,16 +4686,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-1348"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4613,13 +4705,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4629,13 +4721,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1297"
+     "referenced_type" : "type-1349"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4645,13 +4737,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1298"
+     "referenced_type" : "type-1350"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4661,16 +4753,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1299"
+     "referenced_type" : "type-1351"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4680,19 +4772,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4702,16 +4794,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     },
     {
-     "referenced_type" : "type-1300"
+     "referenced_type" : "type-1352"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4721,16 +4813,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4740,13 +4832,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1301"
+     "referenced_type" : "type-1353"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4756,16 +4848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1354"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4775,13 +4867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4791,13 +4883,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1303"
+     "referenced_type" : "type-1355"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4807,28 +4899,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1304"
+     "referenced_type" : "type-1356"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4838,28 +4930,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1305"
+     "referenced_type" : "type-1357"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4869,16 +4961,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1306"
+     "referenced_type" : "type-1358"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4888,13 +4980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4904,16 +4996,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4923,19 +5015,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4945,13 +5037,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-575"
+     "referenced_type" : "type-599"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-426"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4961,16 +5075,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4980,13 +5094,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4996,19 +5110,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1309"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5018,13 +5132,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5034,16 +5148,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-1363"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5053,10 +5167,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5066,13 +5180,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5082,16 +5196,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5101,13 +5215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5117,16 +5231,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5136,10 +5250,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5149,10 +5263,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5162,10 +5276,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5175,16 +5289,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1364"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5193,16 +5307,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-1313"
+     "referenced_type" : "type-1365"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5211,31 +5325,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1366"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5245,19 +5359,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1367"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1220"
+    },
+    {
+     "referenced_type" : "type-1196"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5267,16 +5405,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1368"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5285,16 +5423,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5303,16 +5441,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5322,13 +5460,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1369"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5337,19 +5475,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-1370"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5358,22 +5496,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1319"
+     "referenced_type" : "type-1371"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5382,16 +5520,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1372"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5401,10 +5539,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5414,22 +5552,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1321"
+     "referenced_type" : "type-1373"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5439,16 +5577,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5458,25 +5596,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1374"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5486,25 +5624,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1323"
+     "referenced_type" : "type-1375"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5514,25 +5652,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1376"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5542,25 +5680,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1325"
+     "referenced_type" : "type-1377"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5570,19 +5708,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5592,13 +5730,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5608,13 +5746,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5624,14 +5762,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1156",
+   "return_type" : "type-1207",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5641,16 +5779,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5660,13 +5798,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1326"
+     "referenced_type" : "type-1378"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5676,13 +5814,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1327"
+     "referenced_type" : "type-1379"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5692,14 +5830,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1156",
+   "return_type" : "type-1207",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5709,13 +5847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5725,13 +5863,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1328"
+     "referenced_type" : "type-1380"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5741,14 +5879,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5758,13 +5896,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1329"
+     "referenced_type" : "type-1381"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5774,10 +5912,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5787,10 +5925,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5799,13 +5937,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5815,10 +5953,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5828,16 +5966,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5846,14 +5984,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1268"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5862,14 +6000,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5878,14 +6016,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1209"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5895,16 +6033,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -5912,10 +6050,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1382"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5926,13 +6064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-1331"
+     "referenced_type" : "type-1383"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5941,19 +6079,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1332"
+     "referenced_type" : "type-1384"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5964,10 +6102,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5977,13 +6115,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-192"
+     "referenced_type" : "type-197"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5993,13 +6131,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-192"
+     "referenced_type" : "type-197"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6009,10 +6147,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6022,10 +6160,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6035,10 +6173,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6048,16 +6186,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6067,19 +6205,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1385"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6089,13 +6227,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1334"
+     "referenced_type" : "type-1386"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6105,13 +6243,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1335"
+     "referenced_type" : "type-1387"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6121,13 +6259,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6137,13 +6275,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6153,13 +6291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1337"
+     "referenced_type" : "type-1389"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6169,10 +6307,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6182,10 +6320,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6195,13 +6333,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6211,13 +6349,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6227,19 +6365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6248,22 +6386,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6273,10 +6411,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6286,16 +6424,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6305,13 +6443,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6321,13 +6459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6338,13 +6476,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1341"
+     "referenced_type" : "type-1393"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6354,13 +6492,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6370,13 +6508,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6386,14 +6524,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-465",
+   "return_type" : "type-461",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6403,16 +6541,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6422,13 +6560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1345"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6438,13 +6576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6454,14 +6592,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-465",
+   "return_type" : "type-461",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6471,13 +6609,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6487,13 +6625,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6503,14 +6641,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6520,13 +6658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1348"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6536,10 +6674,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6549,10 +6687,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6561,13 +6699,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6577,10 +6715,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6590,16 +6728,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6612,10 +6750,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6624,14 +6762,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-455"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6640,14 +6778,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6656,14 +6794,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1198"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6674,13 +6812,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6690,13 +6828,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6706,13 +6844,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6722,16 +6860,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -6739,10 +6877,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1407"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6753,13 +6891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1408"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6768,19 +6906,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1357"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6791,10 +6929,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6804,13 +6942,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1209"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6820,13 +6958,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1209"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6836,10 +6974,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6849,10 +6987,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6862,10 +7000,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6875,40 +7013,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1110"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-159"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1273"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-162"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6918,16 +7056,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6937,13 +7075,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1411"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6953,13 +7091,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1412"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6969,13 +7107,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6985,13 +7123,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1413"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7001,7 +7139,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
      "referenced_type" : "type-2"
@@ -7010,7 +7148,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7019,43 +7157,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1110"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-159"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1273"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-162"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1414"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7065,13 +7203,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7081,13 +7219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7097,16 +7235,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-875"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7116,10 +7254,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7129,10 +7267,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7142,13 +7280,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7158,10 +7296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7171,16 +7309,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7190,40 +7328,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1110"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-159"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1273"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-162"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7233,13 +7371,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7249,13 +7387,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7265,16 +7403,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7282,10 +7420,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7296,13 +7434,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7313,10 +7451,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7326,13 +7464,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1198"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7342,13 +7480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1198"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7358,10 +7496,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7371,10 +7509,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7384,10 +7522,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7397,16 +7535,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7416,19 +7554,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1419"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7438,13 +7576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1420"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7454,13 +7592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7470,13 +7608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7486,13 +7624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1370"
+     "referenced_type" : "type-1422"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7502,13 +7640,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1423"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7518,10 +7656,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7531,10 +7669,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7544,13 +7682,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7560,10 +7698,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7573,16 +7711,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7592,13 +7730,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7608,13 +7746,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7624,14 +7762,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-592",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7641,16 +7779,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7660,13 +7798,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1424"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7676,13 +7814,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1425"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7692,14 +7830,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-592",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7709,13 +7847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7725,13 +7863,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7741,14 +7879,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7758,13 +7896,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1375"
+     "referenced_type" : "type-1427"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7774,10 +7912,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7787,10 +7925,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7799,13 +7937,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7815,10 +7953,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7828,16 +7966,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7846,14 +7984,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-223"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7862,14 +8000,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7878,14 +8016,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-625"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7896,13 +8034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-602"
+     "referenced_type" : "type-632"
     },
     {
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1430"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7912,13 +8050,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-602"
+     "referenced_type" : "type-632"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7928,13 +8066,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-602"
+     "referenced_type" : "type-632"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7944,16 +8082,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7961,10 +8099,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7975,13 +8113,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-988"
+    },
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1435"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7990,19 +8149,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8013,10 +8172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8026,13 +8185,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8042,13 +8201,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8058,10 +8217,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8071,10 +8230,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8084,10 +8243,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8097,16 +8256,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8116,13 +8275,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8132,13 +8291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8148,13 +8307,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8164,13 +8323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8180,19 +8339,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8202,13 +8383,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1387"
+     "referenced_type" : "type-1440"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8218,16 +8399,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8237,13 +8418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8253,10 +8434,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8266,10 +8447,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1220"
+    },
+    {
+     "referenced_type" : "type-1196"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8278,16 +8483,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8297,10 +8502,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8310,16 +8515,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8329,19 +8534,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8351,13 +8556,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8367,33 +8572,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEmm",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-32"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEmm",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-32"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-211", "type-405" ]
+   "template_args" : [ "type-410", "type-216", "type-422" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8401,18 +8648,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-405" ]
+   "template_args" : [ "type-410", "type-411", "type-422" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8420,18 +8667,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-405" ]
+   "template_args" : [ "type-410", "type-5", "type-422" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8439,18 +8686,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-189", "type-191", "type-203" ]
+   "template_args" : [ "type-194", "type-196", "type-208" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8458,18 +8705,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-189", "type-190", "type-203" ]
+   "template_args" : [ "type-194", "type-195", "type-208" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8477,18 +8724,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-189", "type-5", "type-203" ]
+   "template_args" : [ "type-194", "type-5", "type-208" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8496,18 +8743,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-133", "type-134", "type-139" ]
+   "template_args" : [ "type-140", "type-141", "type-144" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8515,18 +8762,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-133", "type-5", "type-139" ]
+   "template_args" : [ "type-140", "type-5", "type-144" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8534,18 +8781,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-467", "type-414", "type-1122" ]
+   "template_args" : [ "type-463", "type-419", "type-1174" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8553,18 +8800,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-467", "type-440", "type-1122" ]
+   "template_args" : [ "type-463", "type-446", "type-1174" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8572,18 +8819,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-467", "type-5", "type-1122" ]
+   "template_args" : [ "type-463", "type-5", "type-1174" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8591,18 +8838,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-594", "type-215", "type-603" ]
+   "template_args" : [ "type-623", "type-220", "type-633" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8610,18 +8857,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-594", "type-5", "type-603" ]
+   "template_args" : [ "type-623", "type-5", "type-633" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8629,12 +8876,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
-   "return_type" : "type-209",
+   "return_type" : "type-214",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-211", "type-41" ]
+   "template_args" : [ "type-216", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8642,12 +8889,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
-   "return_type" : "type-376",
+   "return_type" : "type-373",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-134", "type-41" ]
+   "template_args" : [ "type-141", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8655,12 +8902,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
-   "return_type" : "type-213",
+   "return_type" : "type-218",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-215", "type-41" ]
+   "template_args" : [ "type-220", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8668,18 +8915,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-408",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-405", "type-384", "type-41", "type-41" ]
+   "template_args" : [ "type-422", "type-410", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8687,18 +8934,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-187",
+   "return_type" : "type-192",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-189", "type-41", "type-41" ]
+   "template_args" : [ "type-208", "type-194", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8706,18 +8953,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1156",
+   "return_type" : "type-1207",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-139", "type-133", "type-41", "type-41" ]
+   "template_args" : [ "type-144", "type-140", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8725,18 +8972,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-465",
+   "return_type" : "type-461",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1122", "type-467", "type-41", "type-41" ]
+   "template_args" : [ "type-1174", "type-463", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8744,18 +8991,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-592",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-603", "type-594", "type-41", "type-41" ]
+   "template_args" : [ "type-633", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8763,31 +9010,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8797,8 +9044,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-34",
+   "self_type" : "type-1079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8806,8 +9053,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8815,8 +9062,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-922",
+   "referenced_type" : "type-46",
+   "self_type" : "type-964",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8824,8 +9071,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-917",
+   "referenced_type" : "type-56",
+   "self_type" : "type-959",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8833,8 +9080,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8842,8 +9089,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-585",
-   "self_type" : "type-590",
+   "referenced_type" : "type-604",
+   "self_type" : "type-607",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8851,8 +9098,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1237",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8860,8 +9107,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-242",
-   "self_type" : "type-248",
+   "referenced_type" : "type-247",
+   "self_type" : "type-253",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8869,8 +9116,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8878,8 +9125,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-618",
-   "self_type" : "type-621",
+   "referenced_type" : "type-649",
+   "self_type" : "type-652",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8887,8 +9134,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-563",
-   "self_type" : "type-581",
+   "referenced_type" : "type-557",
+   "self_type" : "type-584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8896,8 +9143,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-624",
-   "self_type" : "type-630",
+   "referenced_type" : "type-630",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8905,8 +9152,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-244",
-   "self_type" : "type-554",
+   "referenced_type" : "type-249",
+   "self_type" : "type-545",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8914,8 +9161,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8923,8 +9170,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8932,8 +9179,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-501",
-   "self_type" : "type-500",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8941,8 +9188,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8950,8 +9197,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8959,8 +9206,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8968,8 +9215,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-469",
-   "self_type" : "type-698",
+   "referenced_type" : "type-484",
+   "self_type" : "type-751",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-613",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8977,8 +9233,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-857",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1187",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8986,8 +9242,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-848",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8995,8 +9251,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-681",
+   "referenced_type" : "type-105",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9004,8 +9260,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-472",
-   "self_type" : "type-701",
+   "referenced_type" : "type-487",
+   "self_type" : "type-755",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-124",
+   "self_type" : "type-614",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9013,8 +9278,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-902",
+   "self_type" : "type-1190",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9022,8 +9287,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-829",
-   "self_type" : "type-834",
+   "referenced_type" : "type-871",
+   "self_type" : "type-876",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9032,7 +9297,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-82",
-   "self_type" : "type-1133",
+   "self_type" : "type-1185",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9040,8 +9305,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-644",
+   "referenced_type" : "type-483",
+   "self_type" : "type-672",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9049,8 +9323,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-856",
-   "self_type" : "type-867",
+   "referenced_type" : "type-898",
+   "self_type" : "type-909",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9058,8 +9332,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-847",
-   "self_type" : "type-855",
+   "referenced_type" : "type-889",
+   "self_type" : "type-897",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9067,8 +9341,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-642",
+   "referenced_type" : "type-104",
+   "self_type" : "type-670",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9076,8 +9350,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-376",
-   "self_type" : "type-386",
+   "referenced_type" : "type-373",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9085,8 +9359,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-209",
-   "self_type" : "type-221",
+   "referenced_type" : "type-214",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9094,8 +9368,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-213",
-   "self_type" : "type-415",
+   "referenced_type" : "type-218",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9103,8 +9377,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-482",
+   "referenced_type" : "type-461",
+   "self_type" : "type-472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9112,8 +9386,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9121,8 +9395,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-187",
-   "self_type" : "type-240",
+   "referenced_type" : "type-192",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9130,8 +9404,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-408",
+   "self_type" : "type-442",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9139,8 +9413,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-592",
-   "self_type" : "type-614",
+   "referenced_type" : "type-621",
+   "self_type" : "type-647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9148,8 +9422,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-491",
-   "self_type" : "type-502",
+   "referenced_type" : "type-497",
+   "self_type" : "type-512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9157,8 +9431,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-45",
+   "self_type" : "type-44",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9166,8 +9440,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-913",
-   "self_type" : "type-916",
+   "referenced_type" : "type-955",
+   "self_type" : "type-958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9175,8 +9449,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-944",
-   "self_type" : "type-945",
+   "referenced_type" : "type-986",
+   "self_type" : "type-987",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9184,8 +9458,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-582",
-   "self_type" : "type-600",
+   "referenced_type" : "type-587",
+   "self_type" : "type-610",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9193,8 +9467,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-531",
-   "self_type" : "type-540",
+   "referenced_type" : "type-538",
+   "self_type" : "type-539",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9202,8 +9476,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-954",
+   "referenced_type" : "type-997",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9211,8 +9485,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-168",
+   "referenced_type" : "type-163",
+   "self_type" : "type-173",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9220,8 +9494,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9229,8 +9503,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-461",
-   "self_type" : "type-579",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9238,8 +9512,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-152",
-   "self_type" : "type-154",
+   "referenced_type" : "type-157",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9247,8 +9521,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-157",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9256,8 +9530,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9265,8 +9539,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-179",
+   "self_type" : "type-178",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9274,8 +9548,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9283,17 +9557,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-574",
-   "self_type" : "type-575",
+   "referenced_type" : "type-598",
+   "self_type" : "type-599",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1179",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9301,8 +9584,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-898",
+   "referenced_type" : "type-939",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9310,8 +9593,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
+   "referenced_type" : "type-874",
+   "self_type" : "type-875",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9319,8 +9602,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-828",
+   "referenced_type" : "type-868",
+   "self_type" : "type-870",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9328,8 +9611,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-573",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9337,8 +9620,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-504",
+   "referenced_type" : "type-481",
+   "self_type" : "type-524",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9346,8 +9629,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1273",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9355,8 +9638,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1257",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9364,8 +9647,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9373,17 +9656,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-526",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1090",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1142",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9391,8 +9683,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-483",
-   "self_type" : "type-503",
+   "referenced_type" : "type-505",
+   "self_type" : "type-523",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9400,8 +9692,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-874",
+   "referenced_type" : "type-914",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9409,8 +9701,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
+   "referenced_type" : "type-917",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9418,8 +9710,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-892",
-   "self_type" : "type-894",
+   "referenced_type" : "type-934",
+   "self_type" : "type-936",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9427,8 +9719,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-969",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1012",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9436,8 +9728,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9445,7 +9737,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-427",
+   "referenced_type" : "type-428",
    "self_type" : "type-429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9454,8 +9746,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-406",
+   "self_type" : "type-1268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9463,8 +9755,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9472,8 +9764,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9481,8 +9773,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-217",
-   "self_type" : "type-218",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9490,8 +9782,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-445",
-   "self_type" : "type-451",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9499,8 +9791,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-235",
-   "self_type" : "type-236",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9508,8 +9800,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9517,8 +9809,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-495",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9526,8 +9818,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9535,8 +9827,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-192",
+   "referenced_type" : "type-191",
+   "self_type" : "type-197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9544,8 +9836,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-387",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9553,8 +9845,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-595",
+   "referenced_type" : "type-620",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9562,8 +9854,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-509",
-   "self_type" : "type-810",
+   "referenced_type" : "type-516",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9571,8 +9863,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-862",
-   "self_type" : "type-878",
+   "referenced_type" : "type-904",
+   "self_type" : "type-920",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9580,8 +9872,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-1165",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9589,8 +9881,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-368",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-370",
+   "self_type" : "type-1143",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9598,8 +9890,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1184",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9607,8 +9899,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-1148",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9616,8 +9908,8 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-803",
+   "referenced_type" : "type-298",
+   "self_type" : "type-845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9625,8 +9917,8 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-819",
+   "referenced_type" : "type-860",
+   "self_type" : "type-861",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9634,8 +9926,8 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-816",
-   "self_type" : "type-817",
+   "referenced_type" : "type-858",
+   "self_type" : "type-859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9643,59 +9935,59 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-999",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1245",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-256",
+   "referenced_type" : "type-259",
+   "self_type" : "type-261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-464",
+   "self_type" : "type-467",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-635",
-   "self_type" : "type-637",
+   "referenced_type" : "type-662",
+   "self_type" : "type-664",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
+   "referenced_type" : "type-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-841",
+   "referenced_type" : "type-881",
+   "self_type" : "type-883",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-390",
-   "self_type" : "type-485",
+   "referenced_type" : "type-392",
+   "self_type" : "type-480",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9703,8 +9995,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-813",
-   "self_type" : "type-814",
+   "referenced_type" : "type-855",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9712,8 +10004,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-807",
-   "self_type" : "type-808",
+   "referenced_type" : "type-849",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9721,8 +10013,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-846",
+   "self_type" : "type-848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9730,8 +10022,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-1223",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1277",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9739,8 +10031,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-276",
-   "self_type" : "type-278",
+   "referenced_type" : "type-282",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9748,8 +10040,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-505",
-   "self_type" : "type-507",
+   "referenced_type" : "type-527",
+   "self_type" : "type-529",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9757,8 +10049,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-655",
-   "self_type" : "type-657",
+   "referenced_type" : "type-688",
+   "self_type" : "type-690",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9766,8 +10058,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-947",
-   "self_type" : "type-949",
+   "referenced_type" : "type-989",
+   "self_type" : "type-991",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9775,8 +10067,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-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9784,8 +10076,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-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9793,8 +10085,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-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9802,8 +10094,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-379",
-   "self_type" : "type-378",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9811,8 +10103,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-588",
-   "self_type" : "type-706",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9820,8 +10112,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-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9829,8 +10121,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-885",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-927",
+   "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9838,8 +10130,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-812",
+   "referenced_type" : "type-38",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9847,8 +10139,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-815",
+   "referenced_type" : "type-39",
+   "self_type" : "type-857",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9856,8 +10148,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-809",
-   "self_type" : "type-811",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9865,8 +10157,8 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-909",
+   "referenced_type" : "type-27",
+   "self_type" : "type-951",
    "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"
   },
@@ -9875,7 +10167,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-91",
-   "self_type" : "type-1048",
+   "self_type" : "type-1099",
    "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"
   },
@@ -9884,7 +10176,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1061",
+   "self_type" : "type-1112",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -9895,8 +10187,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-300",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-299",
+   "self_type" : "type-1082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -9904,8 +10196,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-34",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9913,8 +10205,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9922,8 +10214,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1085",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9931,8 +10223,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9940,8 +10232,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9950,7 +10242,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-824",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9958,8 +10250,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9967,8 +10259,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9976,8 +10268,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "type-458",
+   "self_type" : "type-457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9985,8 +10277,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9994,8 +10286,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-766",
+   "self_type" : "type-765",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10021,8 +10313,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-821",
+   "referenced_type" : "type-862",
+   "self_type" : "type-863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10030,8 +10322,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1092",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10039,8 +10331,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-923",
+   "referenced_type" : "type-46",
+   "self_type" : "type-965",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10048,8 +10340,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-918",
+   "referenced_type" : "type-56",
+   "self_type" : "type-960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10057,8 +10349,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-298",
-   "self_type" : "type-297",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10066,8 +10358,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-634",
-   "self_type" : "type-658",
+   "referenced_type" : "type-644",
+   "self_type" : "type-669",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10075,8 +10367,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-515",
+   "referenced_type" : "type-201",
+   "self_type" : "type-518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10084,8 +10376,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10093,8 +10385,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10102,8 +10394,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-273",
+   "referenced_type" : "type-211",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10111,8 +10403,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-498",
+   "referenced_type" : "type-425",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10120,17 +10412,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-652",
+   "referenced_type" : "type-636",
+   "self_type" : "type-683",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-992",
+   "self_type" : "type-1035",
+   "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-1000",
+   "self_type" : "type-1038",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-963",
-   "self_type" : "type-968",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1010",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10138,8 +10448,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-982",
-   "self_type" : "type-988",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1030",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10147,8 +10457,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-971",
-   "self_type" : "type-977",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1019",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10156,8 +10466,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10165,8 +10475,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10183,8 +10493,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-148",
+   "self_type" : "type-1220",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10192,8 +10502,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-938",
+   "referenced_type" : "type-975",
+   "self_type" : "type-980",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10201,8 +10511,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10210,8 +10520,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1229",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10219,8 +10529,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-586",
+   "referenced_type" : "type-604",
+   "self_type" : "type-605",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10228,8 +10538,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1235",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10237,8 +10547,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-246",
+   "referenced_type" : "type-247",
+   "self_type" : "type-251",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10246,8 +10556,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-432",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10255,8 +10565,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-619",
+   "referenced_type" : "type-649",
+   "self_type" : "type-650",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10264,8 +10574,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-577",
+   "referenced_type" : "type-557",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10273,8 +10583,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "type-630",
+   "self_type" : "type-639",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10282,17 +10592,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-524",
+   "referenced_type" : "type-249",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1033",
+   "self_type" : "type-1036",
+   "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-1037",
+   "self_type" : "type-1039",
+   "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-1040",
+   "self_type" : "type-1041",
+   "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-147",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-152",
+   "self_type" : "type-1196",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10300,8 +10637,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-697",
+   "referenced_type" : "type-484",
+   "self_type" : "type-750",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10309,8 +10655,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-857",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1186",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10318,8 +10664,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-848",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10327,8 +10673,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-673",
+   "referenced_type" : "type-105",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10336,8 +10682,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-608",
+   "referenced_type" : "type-248",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10345,8 +10691,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1158",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10354,8 +10700,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1151",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10363,8 +10709,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-346",
+   "referenced_type" : "type-353",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10372,8 +10718,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-339",
+   "referenced_type" : "type-346",
+   "self_type" : "type-347",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10381,8 +10727,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-332",
+   "referenced_type" : "type-336",
+   "self_type" : "type-337",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10390,8 +10736,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10399,8 +10745,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-377",
+   "referenced_type" : "type-141",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10408,8 +10754,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-191",
-   "self_type" : "type-227",
+   "referenced_type" : "type-196",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10417,8 +10763,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
+   "referenced_type" : "type-216",
+   "self_type" : "type-215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10426,8 +10772,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10435,8 +10781,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-487",
+   "self_type" : "type-486",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10444,8 +10790,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10453,8 +10799,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-493",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10462,8 +10808,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-186",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10471,8 +10817,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10480,8 +10826,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
+   "referenced_type" : "type-360",
+   "self_type" : "type-361",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10489,8 +10835,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-564",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10499,7 +10845,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-76",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10534,8 +10880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-446",
+   "self_type" : "type-445",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10543,8 +10889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-233",
+   "referenced_type" : "type-195",
+   "self_type" : "type-238",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10552,8 +10898,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-419",
+   "referenced_type" : "type-411",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10561,8 +10907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-987",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1148",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10570,8 +10916,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10579,8 +10925,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-198",
+   "referenced_type" : "type-198",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10588,8 +10934,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-400",
+   "referenced_type" : "type-415",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10597,8 +10943,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-599",
+   "referenced_type" : "type-627",
+   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10606,8 +10952,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10615,8 +10961,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-1216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10624,8 +10970,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-208",
+   "self_type" : "type-212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10633,8 +10979,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-405",
-   "self_type" : "type-409",
+   "referenced_type" : "type-422",
+   "self_type" : "type-426",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10642,8 +10988,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-607",
+   "referenced_type" : "type-633",
+   "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10651,8 +10997,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10660,8 +11006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10669,8 +11015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-202",
+   "referenced_type" : "type-204",
+   "self_type" : "type-207",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10678,8 +11024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-403",
-   "self_type" : "type-404",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10687,8 +11033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-602",
+   "referenced_type" : "type-631",
+   "self_type" : "type-632",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10696,8 +11042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-466",
+   "referenced_type" : "type-463",
+   "self_type" : "type-462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10705,8 +11051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-140",
+   "self_type" : "type-1208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10714,8 +11060,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
+   "referenced_type" : "type-194",
+   "self_type" : "type-193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10723,8 +11069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10732,17 +11078,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-386",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10750,8 +11105,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10759,8 +11114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10768,8 +11123,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-502",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10777,8 +11132,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "referenced_type" : "type-871",
+   "self_type" : "type-872",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10787,7 +11142,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-82",
-   "self_type" : "type-850",
+   "self_type" : "type-892",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10795,8 +11150,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-643",
+   "referenced_type" : "type-483",
+   "self_type" : "type-671",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10804,8 +11168,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-856",
-   "self_type" : "type-864",
+   "referenced_type" : "type-898",
+   "self_type" : "type-906",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10813,8 +11177,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-847",
-   "self_type" : "type-852",
+   "referenced_type" : "type-889",
+   "self_type" : "type-894",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10822,8 +11186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-371",
+   "referenced_type" : "type-104",
+   "self_type" : "type-380",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10831,8 +11195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-891",
+   "referenced_type" : "type-932",
+   "self_type" : "type-933",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10840,8 +11204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-946",
+   "referenced_type" : "type-199",
+   "self_type" : "type-988",
    "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"
   },
@@ -10858,8 +11222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10867,8 +11231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "type-340",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10885,8 +11249,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-25",
+   "referenced_type" : "type-16",
+   "self_type" : "type-19",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10894,8 +11258,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10903,8 +11267,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-412",
-   "self_type" : "type-417",
+   "referenced_type" : "type-417",
+   "self_type" : "type-427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10912,8 +11276,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-373",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10921,8 +11285,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-228",
+   "referenced_type" : "type-231",
+   "self_type" : "type-233",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10930,8 +11294,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-220",
+   "referenced_type" : "type-214",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10939,8 +11303,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-213",
-   "self_type" : "type-216",
+   "referenced_type" : "type-218",
+   "self_type" : "type-221",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10948,8 +11312,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-441",
+   "referenced_type" : "type-444",
+   "self_type" : "type-452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10957,8 +11321,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-232",
-   "self_type" : "type-234",
+   "referenced_type" : "type-237",
+   "self_type" : "type-239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10966,8 +11330,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-420",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10975,8 +11339,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10984,8 +11348,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10993,8 +11357,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-187",
-   "self_type" : "type-238",
+   "referenced_type" : "type-192",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11002,8 +11366,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-408",
+   "self_type" : "type-440",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11011,8 +11375,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11020,8 +11384,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-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-497",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11029,8 +11393,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-195",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11038,7 +11402,7 @@
    "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-266",
+   "referenced_type" : "type-269",
    "self_type" : "type-279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -11047,8 +11411,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-359",
-   "self_type" : "type-364",
+   "referenced_type" : "type-338",
+   "self_type" : "type-369",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11056,8 +11420,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-976",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11065,8 +11429,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-625",
+   "referenced_type" : "type-525",
+   "self_type" : "type-638",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11074,8 +11438,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-827",
+   "referenced_type" : "type-500",
+   "self_type" : "type-869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11084,7 +11448,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1145",
+   "self_type" : "type-1197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11092,8 +11456,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1067",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11101,8 +11465,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11110,8 +11474,8 @@
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-610",
+   "referenced_type" : "type-59",
+   "self_type" : "type-616",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11119,8 +11483,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-905",
+   "referenced_type" : "type-946",
+   "self_type" : "type-947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11128,8 +11492,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-864",
+   "self_type" : "type-865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11137,8 +11501,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-921",
+   "referenced_type" : "type-45",
+   "self_type" : "type-963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11146,8 +11510,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-915",
+   "referenced_type" : "type-955",
+   "self_type" : "type-957",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11155,8 +11519,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11164,8 +11528,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-925",
-   "self_type" : "type-926",
+   "referenced_type" : "type-967",
+   "self_type" : "type-968",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11173,8 +11537,8 @@
    "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-956",
-   "self_type" : "type-957",
+   "referenced_type" : "type-998",
+   "self_type" : "type-999",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11182,8 +11546,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-962",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1004",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11191,8 +11555,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11200,8 +11564,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-596",
-   "self_type" : "type-597",
+   "referenced_type" : "type-608",
+   "self_type" : "type-609",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11209,8 +11573,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1239",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11218,8 +11582,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-254",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11227,8 +11591,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-453",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11236,8 +11600,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-653",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11245,8 +11609,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-584",
+   "referenced_type" : "type-587",
+   "self_type" : "type-603",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11254,8 +11618,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-531",
-   "self_type" : "type-561",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11263,8 +11627,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11272,8 +11636,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-578",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11281,8 +11645,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-182",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11290,8 +11654,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-125",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11299,8 +11663,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-176",
+   "referenced_type" : "type-180",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11308,8 +11672,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
+   "referenced_type" : "type-176",
+   "self_type" : "type-177",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11317,8 +11690,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11326,8 +11699,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-1130",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11335,8 +11708,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-382",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11344,8 +11717,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1073",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11353,8 +11726,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1128",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11362,8 +11735,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-616",
+   "referenced_type" : "type-624",
+   "self_type" : "type-626",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11371,8 +11744,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1164",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11380,8 +11753,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11389,8 +11762,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-351",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11398,8 +11771,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-344",
+   "referenced_type" : "type-351",
+   "self_type" : "type-352",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11407,8 +11780,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-344",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11416,8 +11789,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11425,8 +11798,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-411",
+   "referenced_type" : "type-413",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11434,8 +11807,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-318",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11443,8 +11816,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
+   "referenced_type" : "type-229",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11452,8 +11825,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-320",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11461,8 +11834,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11470,8 +11843,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11479,8 +11852,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1172",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11488,8 +11861,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11497,8 +11870,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-569",
+   "referenced_type" : "type-591",
+   "self_type" : "type-592",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11506,8 +11879,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1085",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1138",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11515,8 +11888,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-324",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11524,8 +11897,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11533,8 +11906,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11542,8 +11915,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-151",
+   "referenced_type" : "type-143",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11551,8 +11924,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-363",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11560,8 +11933,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-571",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11569,8 +11942,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-747",
+   "self_type" : "type-748",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11578,8 +11951,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1140",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11587,8 +11960,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-135",
+   "referenced_type" : "type-139",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11596,8 +11969,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-329",
-   "self_type" : "type-330",
+   "referenced_type" : "type-334",
+   "self_type" : "type-335",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11605,8 +11978,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-582",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11614,17 +11987,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-692",
+   "referenced_type" : "type-744",
+   "self_type" : "type-745",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1265",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11632,8 +12014,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1202",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11641,8 +12023,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-836",
+   "referenced_type" : "type-874",
+   "self_type" : "type-878",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11650,8 +12032,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-572",
-   "self_type" : "type-649",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11659,8 +12041,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-463",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11668,8 +12050,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11677,8 +12059,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1256",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11686,8 +12068,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11695,8 +12077,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11704,8 +12095,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-483",
-   "self_type" : "type-484",
+   "referenced_type" : "type-505",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11713,8 +12104,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-914",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11722,8 +12113,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-876",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11731,8 +12122,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-892",
-   "self_type" : "type-893",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11740,8 +12131,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1149",
    "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"
   },
@@ -11749,8 +12140,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11758,8 +12149,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-293",
+   "referenced_type" : "type-293",
+   "self_type" : "type-294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11767,8 +12158,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
    "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"
   },
@@ -11776,8 +12167,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11785,8 +12176,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-265",
+   "referenced_type" : "type-267",
+   "self_type" : "type-268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11794,8 +12185,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11803,8 +12194,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11812,8 +12203,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-231",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11821,8 +12212,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-223",
+   "referenced_type" : "type-213",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11830,8 +12221,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-219",
+   "referenced_type" : "type-222",
+   "self_type" : "type-224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11839,8 +12230,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-454",
+   "referenced_type" : "type-454",
+   "self_type" : "type-456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11848,8 +12239,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-235",
-   "self_type" : "type-237",
+   "referenced_type" : "type-240",
+   "self_type" : "type-242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11857,8 +12248,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11866,8 +12257,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-488",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11875,8 +12266,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11884,8 +12275,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-241",
+   "referenced_type" : "type-191",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11893,8 +12284,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-443",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11902,8 +12293,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-648",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11911,8 +12302,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-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11920,8 +12311,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-862",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11929,8 +12320,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-1165",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1272",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11938,8 +12329,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-286",
-   "self_type" : "type-287",
+   "referenced_type" : "type-284",
+   "self_type" : "type-286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11947,8 +12338,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-368",
-   "self_type" : "type-374",
+   "referenced_type" : "type-370",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11956,8 +12347,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11965,8 +12356,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-838",
-   "self_type" : "type-851",
+   "referenced_type" : "type-880",
+   "self_type" : "type-893",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11974,8 +12365,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11983,8 +12374,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-58",
+   "self_type" : "type-57",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11992,8 +12383,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12001,8 +12392,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-390",
-   "self_type" : "type-437",
+   "referenced_type" : "type-392",
+   "self_type" : "type-438",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12010,8 +12401,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12019,8 +12410,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12028,8 +12419,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12037,8 +12428,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-896",
+   "referenced_type" : "type-937",
+   "self_type" : "type-938",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12046,8 +12437,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1075",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12055,8 +12446,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-871",
+   "referenced_type" : "type-27",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12064,8 +12455,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-583",
+   "referenced_type" : "type-393",
+   "self_type" : "type-597",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12073,8 +12464,8 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-648",
+   "referenced_type" : "type-171",
+   "self_type" : "type-658",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12083,7 +12474,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-91",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12091,8 +12482,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-32",
+   "self_type" : "type-1274",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12100,8 +12491,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-935",
+   "referenced_type" : "type-830",
+   "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12109,8 +12500,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12118,8 +12509,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12127,8 +12518,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-40",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1076",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12140,8 +12531,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12150,8 +12541,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-251",
-   "self_type" : "type-253",
+   "referenced_type" : "type-256",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12160,8 +12551,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-442",
-   "self_type" : "type-444",
+   "referenced_type" : "type-457",
+   "self_type" : "type-459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12170,8 +12561,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-631",
+   "referenced_type" : "type-659",
+   "self_type" : "type-661",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12180,8 +12571,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-765",
+   "self_type" : "type-767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12200,8 +12591,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-145",
+   "referenced_type" : "type-17",
+   "self_type" : "type-150",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12210,8 +12601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-647",
-   "self_type" : "type-904",
+   "referenced_type" : "type-657",
+   "self_type" : "type-946",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12221,7 +12612,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-822",
+   "self_type" : "type-864",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12230,8 +12621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12240,8 +12631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-913",
+   "referenced_type" : "type-56",
+   "self_type" : "type-955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12250,8 +12641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-49",
-   "self_type" : "type-991",
+   "referenced_type" : "type-37",
+   "self_type" : "type-1042",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12260,8 +12651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-144",
-   "self_type" : "type-925",
+   "referenced_type" : "type-149",
+   "self_type" : "type-967",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12270,8 +12661,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-950",
-   "self_type" : "type-956",
+   "referenced_type" : "type-992",
+   "self_type" : "type-998",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12280,8 +12671,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-958",
-   "self_type" : "type-961",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1003",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12290,8 +12681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-933",
-   "self_type" : "type-944",
+   "referenced_type" : "type-975",
+   "self_type" : "type-986",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12300,8 +12691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1232",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12310,8 +12701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-585",
-   "self_type" : "type-596",
+   "referenced_type" : "type-604",
+   "self_type" : "type-608",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12320,8 +12711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1238",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12330,8 +12721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-249",
+   "referenced_type" : "type-247",
+   "self_type" : "type-254",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12340,8 +12731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12350,8 +12741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-618",
-   "self_type" : "type-622",
+   "referenced_type" : "type-649",
+   "self_type" : "type-653",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12360,8 +12751,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-563",
-   "self_type" : "type-582",
+   "referenced_type" : "type-557",
+   "self_type" : "type-587",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12370,8 +12761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-244",
-   "self_type" : "type-531",
+   "referenced_type" : "type-249",
+   "self_type" : "type-538",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12380,8 +12771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-953",
-   "self_type" : "type-955",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12390,8 +12781,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-699",
+   "referenced_type" : "type-484",
+   "self_type" : "type-753",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12400,8 +12791,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12410,8 +12801,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-178",
-   "self_type" : "type-177",
+   "referenced_type" : "type-183",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12421,7 +12812,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-86",
-   "self_type" : "type-136",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12431,7 +12822,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-78",
-   "self_type" : "type-175",
+   "self_type" : "type-180",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12441,7 +12832,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-94",
-   "self_type" : "type-171",
+   "self_type" : "type-176",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12450,8 +12851,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-857",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1188",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12460,8 +12861,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-848",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12470,8 +12871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-369",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12480,8 +12881,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-869",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-911",
+   "self_type" : "type-1062",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12490,8 +12891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-105",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12500,8 +12901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-611",
+   "referenced_type" : "type-248",
+   "self_type" : "type-624",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12510,8 +12911,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1163",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12520,8 +12921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1155",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12530,8 +12931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-347",
-   "self_type" : "type-350",
+   "referenced_type" : "type-355",
+   "self_type" : "type-358",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12540,8 +12941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-340",
-   "self_type" : "type-343",
+   "referenced_type" : "type-348",
+   "self_type" : "type-351",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12550,8 +12951,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-333",
-   "self_type" : "type-336",
+   "referenced_type" : "type-341",
+   "self_type" : "type-344",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12560,8 +12961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-160",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-165",
+   "self_type" : "type-1119",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12570,8 +12971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "type-164",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12580,8 +12981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12590,8 +12991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-414",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-419",
+   "self_type" : "type-1135",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12600,8 +13001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-134",
-   "self_type" : "type-410",
+   "referenced_type" : "type-141",
+   "self_type" : "type-413",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12610,8 +13011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-191",
-   "self_type" : "type-317",
+   "referenced_type" : "type-196",
+   "self_type" : "type-322",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12620,8 +13021,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-211",
-   "self_type" : "type-224",
+   "referenced_type" : "type-216",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12630,8 +13031,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-215",
-   "self_type" : "type-315",
+   "referenced_type" : "type-220",
+   "self_type" : "type-320",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12640,8 +13041,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12650,8 +13051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-472",
-   "self_type" : "type-703",
+   "referenced_type" : "type-487",
+   "self_type" : "type-757",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12660,8 +13061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-473",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12670,8 +13071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12680,8 +13081,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-459",
-   "self_type" : "type-461",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12690,8 +13091,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1118",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12700,8 +13101,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12710,8 +13111,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-161",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12720,8 +13121,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12730,8 +13131,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-181",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-186",
+   "self_type" : "type-1252",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12740,8 +13141,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1171",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -12750,8 +13151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-354",
-   "self_type" : "type-357",
+   "referenced_type" : "type-362",
+   "self_type" : "type-365",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -12760,8 +13161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-565",
-   "self_type" : "type-568",
+   "referenced_type" : "type-588",
+   "self_type" : "type-591",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -12771,7 +13172,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-89",
-   "self_type" : "type-113",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12781,7 +13182,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-81",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12791,7 +13192,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-97",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12801,7 +13202,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-90",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12811,7 +13212,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12820,8 +13221,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-440",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-446",
+   "self_type" : "type-1137",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -12830,8 +13231,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-319",
+   "referenced_type" : "type-195",
+   "self_type" : "type-324",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -12840,8 +13241,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-550",
+   "referenced_type" : "type-411",
+   "self_type" : "type-570",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -12850,8 +13251,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12860,8 +13261,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-101",
-   "self_type" : "type-574",
+   "referenced_type" : "type-103",
+   "self_type" : "type-598",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12870,8 +13271,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-100",
-   "self_type" : "type-109",
+   "referenced_type" : "type-102",
+   "self_type" : "type-111",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12880,8 +13281,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1173",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -12890,8 +13291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-144",
+   "self_type" : "type-143",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12900,8 +13301,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-362",
+   "referenced_type" : "type-208",
+   "self_type" : "type-367",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -12910,8 +13311,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-405",
-   "self_type" : "type-570",
+   "referenced_type" : "type-422",
+   "self_type" : "type-593",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12920,8 +13321,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-603",
-   "self_type" : "type-694",
+   "referenced_type" : "type-633",
+   "self_type" : "type-747",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -12931,7 +13332,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-122",
-   "self_type" : "type-125",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -12940,8 +13341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-467",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-463",
+   "self_type" : "type-1139",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -12950,8 +13351,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-132",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -12960,8 +13361,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-329",
+   "referenced_type" : "type-194",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -12970,8 +13371,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-410",
+   "self_type" : "type-582",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -12980,18 +13381,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-594",
-   "self_type" : "type-691",
+   "referenced_type" : "type-623",
+   "self_type" : "type-744",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-124",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-123",
+   "self_type" : "type-129",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13001,7 +13422,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13010,8 +13431,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1178",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13020,8 +13441,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-496",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-502",
+   "self_type" : "type-1201",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13030,8 +13451,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-161",
-   "self_type" : "type-897",
+   "referenced_type" : "type-166",
+   "self_type" : "type-939",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13040,8 +13461,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-832",
+   "referenced_type" : "type-871",
+   "self_type" : "type-874",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13051,7 +13472,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-82",
-   "self_type" : "type-826",
+   "self_type" : "type-868",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13060,8 +13481,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-572",
+   "referenced_type" : "type-483",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13070,8 +13491,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-462",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13080,8 +13501,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13091,7 +13512,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-1204",
+   "self_type" : "type-1255",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13101,7 +13522,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-77",
-   "self_type" : "type-1211",
+   "self_type" : "type-1262",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13111,7 +13532,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-1207",
+   "self_type" : "type-1259",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13120,8 +13551,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-847",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-889",
+   "self_type" : "type-1141",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13130,8 +13561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-505",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13140,8 +13571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-872",
+   "referenced_type" : "type-910",
+   "self_type" : "type-914",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13150,8 +13581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-875",
+   "referenced_type" : "type-104",
+   "self_type" : "type-917",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13160,8 +13591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13170,8 +13601,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-1093",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1147",
    "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"
   },
@@ -13180,8 +13611,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-907",
-   "self_type" : "type-908",
+   "referenced_type" : "type-949",
+   "self_type" : "type-950",
    "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"
   },
@@ -13191,7 +13622,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-967",
+   "self_type" : "type-1009",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13200,8 +13631,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-966",
-   "self_type" : "type-969",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1011",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13210,8 +13641,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-268",
-   "self_type" : "type-288",
+   "referenced_type" : "type-271",
+   "self_type" : "type-293",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13220,8 +13651,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-1045",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13230,8 +13661,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-1044",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1098",
    "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"
   },
@@ -13240,8 +13671,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-361",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-340",
+   "self_type" : "type-1093",
    "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"
   },
@@ -13250,8 +13681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-51",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13260,8 +13691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-36",
-   "self_type" : "type-262",
+   "referenced_type" : "type-24",
+   "self_type" : "type-267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13270,8 +13701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-412",
-   "self_type" : "type-427",
+   "referenced_type" : "type-417",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13280,8 +13711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-402",
+   "referenced_type" : "type-373",
+   "self_type" : "type-406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13290,8 +13721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-229",
+   "referenced_type" : "type-231",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13300,8 +13731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13310,8 +13741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-217",
+   "referenced_type" : "type-218",
+   "self_type" : "type-222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13320,8 +13751,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-438",
-   "self_type" : "type-445",
+   "referenced_type" : "type-444",
+   "self_type" : "type-454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13330,8 +13761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13340,8 +13771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13350,8 +13781,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-489",
+   "referenced_type" : "type-461",
+   "self_type" : "type-495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13360,8 +13791,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13370,8 +13801,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-186",
+   "referenced_type" : "type-192",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13380,8 +13811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13390,8 +13821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13400,8 +13831,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-491",
-   "self_type" : "type-509",
+   "referenced_type" : "type-497",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13410,8 +13841,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-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-905",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13420,8 +13851,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-195",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13430,8 +13861,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-266",
-   "self_type" : "type-286",
+   "referenced_type" : "type-269",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13440,8 +13871,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-359",
-   "self_type" : "type-368",
+   "referenced_type" : "type-338",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13450,8 +13881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1159",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13460,8 +13891,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-494",
-   "self_type" : "type-838",
+   "referenced_type" : "type-500",
+   "self_type" : "type-880",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13471,7 +13902,7 @@
    "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-3",
-   "self_type" : "type-1148",
+   "self_type" : "type-1200",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13480,8 +13911,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-41",
+   "self_type" : "type-298",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13490,8 +13921,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13500,8 +13931,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13511,7 +13942,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-92",
-   "self_type" : "type-818",
+   "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13520,8 +13951,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-793",
-   "self_type" : "type-816",
+   "referenced_type" : "type-835",
+   "self_type" : "type-858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13530,8 +13961,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-39",
-   "self_type" : "type-999",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13539,48 +13970,48 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-636",
-   "self_type" : "type-635",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13588,8 +14019,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13598,8 +14029,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-45",
-   "self_type" : "type-813",
+   "referenced_type" : "type-33",
+   "self_type" : "type-855",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13608,8 +14039,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-171",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13618,8 +14049,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-717",
-   "self_type" : "type-807",
+   "referenced_type" : "type-735",
+   "self_type" : "type-849",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13628,8 +14059,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-847",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13638,8 +14069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13648,8 +14079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13658,8 +14089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-561",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13668,18 +14099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-724",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13696,10 +14117,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
+   "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13708,8 +14139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13718,8 +14149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13728,8 +14159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13738,8 +14169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13748,8 +14179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13758,8 +14189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13768,8 +14199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13778,8 +14209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13788,8 +14219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13798,8 +14229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13808,8 +14239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-742",
-   "self_type" : "type-741",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13818,8 +14249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13828,8 +14259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-309",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13838,8 +14269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13848,8 +14279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-534",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13858,8 +14289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13868,8 +14299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13878,8 +14309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13888,8 +14319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "type-311",
+   "self_type" : "type-310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13898,8 +14329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13908,8 +14339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13918,8 +14349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13928,8 +14359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-740",
-   "self_type" : "type-739",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13938,8 +14369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13948,8 +14379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13958,8 +14389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13968,8 +14399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
+   "referenced_type" : "type-722",
+   "self_type" : "type-721",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13978,8 +14409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13988,8 +14419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13998,8 +14429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14008,8 +14439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14018,8 +14449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14028,8 +14459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14038,8 +14469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14048,8 +14479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-787",
+   "self_type" : "type-786",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14058,8 +14489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-113",
+   "self_type" : "type-112",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14068,8 +14499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14078,8 +14509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14088,8 +14519,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14108,8 +14549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-329",
+   "self_type" : "type-328",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14118,8 +14559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-565",
+   "self_type" : "type-564",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14128,8 +14569,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-729",
+   "self_type" : "type-728",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14148,8 +14599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14158,8 +14609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14168,8 +14619,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14188,8 +14649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14198,8 +14659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14208,8 +14669,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-757",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14218,38 +14689,88 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-135",
+   "self_type" : "type-134",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-741",
+   "self_type" : "type-740",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-581",
+   "self_type" : "type-580",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-743",
+   "self_type" : "type-742",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-131",
    "self_type" : "type-130",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14258,8 +14779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14268,8 +14789,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-737",
+   "self_type" : "type-736",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14278,8 +14809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-133",
+   "self_type" : "type-132",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14288,8 +14819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-555",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14298,8 +14829,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14308,8 +14849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14318,8 +14859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
+   "referenced_type" : "type-273",
+   "self_type" : "type-272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14328,8 +14869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14338,8 +14879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-650",
+   "referenced_type" : "type-681",
+   "self_type" : "type-680",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14348,8 +14889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-725",
-   "self_type" : "type-724",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14358,8 +14899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14368,8 +14909,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-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14378,8 +14919,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-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14388,8 +14929,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-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-305",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14398,8 +14939,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-523",
-   "self_type" : "type-522",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14408,8 +14949,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-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-708",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14418,8 +14959,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-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1101",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14428,8 +14969,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-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14438,8 +14979,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-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14448,8 +14989,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-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14458,8 +14999,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-705",
+   "self_type" : "type-704",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14468,8 +15009,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-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14478,8 +15019,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-277",
-   "self_type" : "type-276",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14488,8 +15029,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-506",
-   "self_type" : "type-505",
+   "referenced_type" : "type-528",
+   "self_type" : "type-527",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14498,8 +15039,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-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-689",
+   "self_type" : "type-688",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14508,8 +15049,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-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14518,8 +15059,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-1198",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1248",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14528,8 +15069,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-260",
-   "self_type" : "type-259",
+   "referenced_type" : "type-265",
+   "self_type" : "type-264",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14538,8 +15079,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-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14548,8 +15089,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-641",
-   "self_type" : "type-640",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14558,8 +15099,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-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14568,8 +15109,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-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1246",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14578,8 +15119,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-263",
+   "self_type" : "type-262",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14588,8 +15129,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14598,8 +15139,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-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14608,8 +15149,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-854",
-   "self_type" : "type-853",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14618,8 +15159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14628,8 +15169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1204",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14638,8 +15179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-185",
-   "self_type" : "type-184",
+   "referenced_type" : "type-190",
+   "self_type" : "type-189",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14648,8 +15189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-404",
+   "self_type" : "type-403",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14658,8 +15199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-619",
+   "self_type" : "type-618",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14668,8 +15209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-824",
+   "self_type" : "type-823",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14679,7 +15220,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-91",
-   "self_type" : "type-885",
+   "self_type" : "type-927",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14689,7 +15230,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-50",
+   "self_type" : "type-38",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14698,8 +15239,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-44",
-   "self_type" : "type-51",
+   "referenced_type" : "type-32",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14708,8 +15249,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-788",
-   "self_type" : "type-940",
+   "referenced_type" : "type-830",
+   "self_type" : "type-982",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14718,8 +15259,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-395",
-   "self_type" : "type-809",
+   "referenced_type" : "type-397",
+   "self_type" : "type-851",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14727,8 +15268,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-41",
-   "self_type" : "type-895",
+   "referenced_type" : "type-29",
+   "self_type" : "type-937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -14736,8 +15277,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-302",
+   "referenced_type" : "type-41",
+   "self_type" : "type-301",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -14746,8 +15287,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-39",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -14761,14 +15302,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -14780,17 +15321,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-53"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-46", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -14800,17 +15341,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-656"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-647" ],
+   "template_args" : [ "type-657" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -14820,17 +15361,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-643"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-642",
+   "self_type" : "type-642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-634" ],
+   "template_args" : [ "type-644" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -14840,14 +15381,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-35"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -14859,14 +15400,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1027"
+     "referenced_type" : "type-1079"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -14876,7 +15417,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-655"
     }
    ],
    "fields" :
@@ -14885,20 +15426,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-658"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -14910,14 +15451,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1084"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1083",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -14929,14 +15470,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1087"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -14948,14 +15489,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1087"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -15026,8 +15567,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -15037,8 +15578,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -15064,14 +15605,14 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1091",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -15082,17 +15623,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-54"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-55" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -15139,14 +15680,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -15204,14 +15745,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-47"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -15223,14 +15764,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -15250,62 +15791,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-34"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-299"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-295"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -15395,17 +15936,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-40" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -15452,32 +15993,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-38"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-37",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -15529,14 +16070,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-642"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -15564,7 +16105,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -15573,32 +16114,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 192,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -15714,7 +16255,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     },
     {
      "access" : "private",
@@ -15726,14 +16267,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -15821,23 +16362,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-419"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-414" ],
+   "template_args" : [ "type-419" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -16010,23 +16551,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-141"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -16211,23 +16752,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-196" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -16404,23 +16945,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-211" ],
+   "template_args" : [ "type-216" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -16697,23 +17238,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-220"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-215" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -16890,23 +17431,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-440" ],
+   "template_args" : [ "type-446" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17079,23 +17620,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17272,23 +17813,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-411" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -17605,23 +18146,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-463"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-932",
-   "self_type" : "type-932",
+   "referenced_type" : "type-974",
+   "self_type" : "type-974",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-467" ],
+   "template_args" : [ "type-463" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17794,23 +18335,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17999,23 +18540,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18196,23 +18737,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18449,6 +18990,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -18557,23 +19102,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-636",
+   "self_type" : "type-636",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-594" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18646,6 +19191,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -18757,17 +19306,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -18937,23 +19486,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-993"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-952"
+     "referenced_type" : "type-994"
     }
    ],
    "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-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-953" ],
+   "template_args" : [ "type-3", "type-995" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -18963,23 +19512,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-1001"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-960"
+     "referenced_type" : "type-1002"
     }
    ],
    "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-958",
-   "self_type" : "type-958",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1000",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-41" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -18989,23 +19538,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-964"
+     "referenced_type" : "type-1006"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-1007"
     }
    ],
    "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-963",
-   "self_type" : "type-963",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1005",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-966", "type-889" ],
+   "template_args" : [ "type-1008", "type-931" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19015,23 +19564,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1025"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-984"
+     "referenced_type" : "type-1026"
     }
    ],
    "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-982",
-   "self_type" : "type-982",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1024",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-985", "type-986" ],
+   "template_args" : [ "type-1027", "type-1028" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19041,23 +19590,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-1014"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-1015"
     }
    ],
    "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-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1013",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-974", "type-975" ],
+   "template_args" : [ "type-1016", "type-1017" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19081,13 +19630,13 @@
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -19098,7 +19647,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-829"
+     "referenced_type" : "type-871"
     },
     {
      "is_virtual" : true,
@@ -19108,8 +19657,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-879",
+   "self_type" : "type-879",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19196,8 +19745,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -19401,8 +19950,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -19484,13 +20033,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-842"
+     "referenced_type" : "type-884"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-943"
     },
     {
      "access" : "private",
@@ -19507,11 +20056,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-942",
+   "self_type" : "type-942",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19521,110 +20070,110 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-976"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 320,
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-107"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 384,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 512,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 576,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-977"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 640,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 704,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 768,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 832,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 896,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 904,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 912,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-978"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 1024,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -19636,23 +20185,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-830"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-830"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-983",
+   "self_type" : "type-983",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -19672,122 +20221,122 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 128,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 896,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 960,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 1024,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 1088,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-34"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-36"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 1728,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-42"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 1856,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-52"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 2240,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 2304,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 2312,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 2368,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-61"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -19865,7 +20414,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -19875,8 +20424,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -19886,7 +20435,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19895,17 +20444,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1054" ],
+   "template_args" : [ "type-1106" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -19913,7 +20462,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19922,17 +20471,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-465"
+     "referenced_type" : "type-461"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-465" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -19940,7 +20489,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19949,17 +20498,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -19967,7 +20516,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19976,17 +20525,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-187" ],
+   "template_args" : [ "type-192" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -19994,7 +20543,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -20003,17 +20552,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-408" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -20021,7 +20570,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -20030,17 +20579,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-649",
+   "self_type" : "type-649",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-592" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -20048,7 +20597,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -20057,17 +20606,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20075,17 +20624,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20095,26 +20644,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -20124,34 +20673,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1034"
+    }
+   ],
+   "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-1033",
+   "self_type" : "type-1033",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-992" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1034"
+    }
+   ],
+   "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-1037",
+   "self_type" : "type-1037",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1000" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1034"
+    }
+   ],
+   "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-1040",
+   "self_type" : "type-1040",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1005" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-150"
+     "referenced_type" : "type-155"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20180,18 +20789,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-995",
+   "self_type" : "type-995",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20203,14 +20812,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20219,8 +20828,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20229,8 +20838,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20239,8 +20848,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20256,12 +20865,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-87",
    "self_type" : "type-87",
@@ -20276,19 +20885,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -20300,19 +20909,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-886",
+   "self_type" : "type-886",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -20324,19 +20933,43 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-471"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-486"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-32"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -20348,19 +20981,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -20376,12 +21009,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-79",
    "self_type" : "type-79",
@@ -20396,19 +21029,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-492"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -20420,19 +21053,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-185"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -20448,12 +21081,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-95",
    "self_type" : "type-95",
@@ -20467,16 +21100,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -20485,16 +21118,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-485"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-472" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -20503,16 +21136,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-459" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -20521,16 +21154,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-491"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-493" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -20539,16 +21172,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-186" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -20611,13 +21244,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-76" ],
@@ -20629,16 +21262,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-858"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-124" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-900"
     }
    ],
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-899",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -20647,13 +21298,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-891"
     }
    ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-890",
+   "self_type" : "type-890",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-82" ],
@@ -20665,16 +21316,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-104" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -20683,16 +21334,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-923"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20702,19 +21353,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-616"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-923",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20734,7 +21385,7 @@
    "self_type" : "type-83",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-58" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20744,16 +21395,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
@@ -20767,16 +21418,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20786,19 +21437,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20810,19 +21461,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-901"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEUt_E"
@@ -20834,19 +21485,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-850"
+     "referenced_type" : "type-892"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20858,19 +21509,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -20881,16 +21532,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-912"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -20900,19 +21551,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-871"
+     "referenced_type" : "type-913"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-912",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20923,16 +21574,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-943",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -20942,19 +21593,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20965,13 +21616,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-91" ],
@@ -20984,19 +21635,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-107"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -21005,8 +21656,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -21018,20 +21669,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -21040,8 +21691,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-924",
+   "self_type" : "type-924",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -21051,8 +21702,8 @@
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-925",
+   "self_type" : "type-925",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -21063,7 +21714,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21072,13 +21723,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -21200,7 +21851,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21209,13 +21860,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -21337,7 +21988,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21346,13 +21997,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -21474,7 +22125,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21483,13 +22134,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -21611,7 +22262,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21620,13 +22271,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -21748,10 +22399,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-971"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -21760,19 +22411,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1109"
+     "referenced_type" : "type-1161"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1110"
+     "referenced_type" : "type-1162"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -21961,10 +22612,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-970"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -21973,19 +22624,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1153"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-1154"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -22183,10 +22834,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-276"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -22195,19 +22846,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-355",
+   "self_type" : "type-355",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -22399,10 +23050,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -22411,19 +23062,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -22690,10 +23341,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -22702,19 +23353,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -22907,23 +23558,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -22938,8 +23589,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -23061,8 +23712,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -23196,8 +23847,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -23323,8 +23974,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-216",
+   "self_type" : "type-216",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -23550,8 +24201,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -23673,18 +24324,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-488"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -23705,8 +24356,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -23727,8 +24378,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -23739,13 +24390,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -23761,18 +24412,18 @@
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "size",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -23793,8 +24444,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -23804,7 +24455,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -23813,13 +24464,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -23941,7 +24592,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -23950,13 +24601,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -24078,7 +24729,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -24087,13 +24738,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -24215,10 +24866,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -24227,19 +24878,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1116"
+     "referenced_type" : "type-1168"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1117"
+     "referenced_type" : "type-1169"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -24428,10 +25079,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -24440,19 +25091,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-363"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-364"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -24644,10 +25295,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -24656,19 +25307,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-590"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -24993,7 +25644,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     },
     {
      "field_name" : "doubleValue",
@@ -25057,7 +25708,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     },
     {
      "field_name" : "doubleValue",
@@ -25083,13 +25734,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -25206,13 +25857,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -25333,13 +25984,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -25601,13 +26252,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -25617,7 +26268,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -25626,13 +26277,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-465"
+     "referenced_type" : "type-461"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-987",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1029",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -25754,7 +26405,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -25763,13 +26414,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -25891,7 +26542,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -25900,13 +26551,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -26028,7 +26679,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -26037,13 +26688,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -26165,7 +26816,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -26174,13 +26825,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -26302,10 +26953,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26314,19 +26965,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1123"
+     "referenced_type" : "type-1175"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1124"
+     "referenced_type" : "type-1176"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -26515,10 +27166,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26527,19 +27178,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -26740,10 +27391,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26752,19 +27403,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -26959,10 +27610,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26971,19 +27622,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-422",
+   "self_type" : "type-422",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -27177,6 +27828,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -27301,10 +27955,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-636"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27313,19 +27967,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-633",
+   "self_type" : "type-633",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -27396,6 +28050,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -27520,10 +28177,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-463"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27532,19 +28189,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1221",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -27675,10 +28332,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27687,19 +28344,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -27842,10 +28499,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27854,19 +28511,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -28003,10 +28660,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -28015,19 +28672,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-407"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -28221,6 +28878,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -8,
      "kind" : "offset_to_top"
     },
@@ -28287,10 +28947,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -28299,19 +28959,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -28382,6 +29042,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -8,
      "kind" : "offset_to_top"
     },
@@ -28448,13 +29111,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-446"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -28571,13 +29234,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -28710,13 +29373,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -28841,13 +29504,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-411"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -29086,6 +29749,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29136,13 +29803,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-220"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -29217,6 +29884,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29263,19 +29934,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-104"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-123"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -29288,13 +29981,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-903"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-902",
+   "self_type" : "type-902",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -29314,13 +30007,13 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 64,
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
      "field_name" : "mCookie",
      "field_offset" : 192,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
@@ -29331,8 +30024,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -29417,8 +30110,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -29500,19 +30193,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -29524,13 +30217,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
@@ -29541,8 +30234,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-871",
+   "self_type" : "type-871",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -29566,7 +30259,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -29584,7 +30277,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-885"
     },
     {
      "access" : "private",
@@ -29596,16 +30289,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-884",
+   "self_type" : "type-884",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -29615,7 +30308,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     },
     {
      "access" : "private",
@@ -29627,16 +30320,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-472" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -29646,7 +30339,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -29658,16 +30351,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-459" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -29677,7 +30370,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-490"
     },
     {
      "access" : "private",
@@ -29689,16 +30382,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-493" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -29708,7 +30401,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     },
     {
      "access" : "private",
@@ -29720,16 +30413,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1250",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-186" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -29751,7 +30444,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -29782,7 +30475,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -29813,7 +30506,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -29832,7 +30525,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -29844,13 +30537,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-76" ],
@@ -29863,7 +30556,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -29875,16 +30568,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-124" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-899"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-41"
     }
    ],
    "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-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-898",
+   "self_type" : "type-898",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -29894,7 +30618,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-890"
     },
     {
      "access" : "private",
@@ -29906,13 +30630,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-82" ],
@@ -29925,7 +30649,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -29937,16 +30661,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-104" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -29956,7 +30680,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-922"
     },
     {
      "access" : "private",
@@ -29968,16 +30692,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -29987,7 +30711,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-911"
     },
     {
      "access" : "private",
@@ -29999,16 +30723,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -30018,7 +30742,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
@@ -30030,13 +30754,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -30049,19 +30773,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -30071,10 +30795,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -30083,13 +30807,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 960,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "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",
@@ -30211,10 +30935,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-969"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -30223,19 +30947,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1094"
+     "referenced_type" : "type-1145"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1095"
+     "referenced_type" : "type-1146"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "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",
@@ -30419,23 +31143,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-948",
+   "self_type" : "type-948",
    "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"
@@ -30566,8 +31290,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "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",
@@ -30719,23 +31443,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-910"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1097",
    "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"
@@ -30750,8 +31474,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "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",
@@ -30866,17 +31590,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-296"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-298" ],
+   "template_args" : [ "type-297" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -30886,17 +31610,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-515"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-201" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -30926,17 +31650,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -30946,17 +31670,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-148" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -30966,17 +31690,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -30986,17 +31710,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-418"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-414" ],
+   "template_args" : [ "type-419" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -31006,17 +31730,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-374"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -31026,17 +31750,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-232"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-196" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -31046,17 +31770,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-211" ],
+   "template_args" : [ "type-216" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -31066,17 +31790,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-215" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -31086,17 +31810,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-440" ],
+   "template_args" : [ "type-446" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -31106,17 +31830,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -31126,17 +31850,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-411" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -31146,17 +31870,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-467" ],
+   "template_args" : [ "type-463" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -31166,17 +31890,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -31186,17 +31910,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -31206,17 +31930,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -31226,17 +31950,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-594" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -31246,17 +31970,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-492"
+     "referenced_type" : "type-498"
     }
    ],
    "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-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-493" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -31266,17 +31990,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-501"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-905",
+   "self_type" : "type-905",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-496" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -31292,8 +32016,8 @@
    "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-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -31306,17 +32030,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-270"
     }
    ],
    "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-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-268" ],
+   "template_args" : [ "type-271" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -31326,47 +32050,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-339"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-361" ],
+   "template_args" : [ "type-340" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31376,63 +32100,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31442,8 +32166,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31453,74 +32177,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-810",
+   "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-682",
+   "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-696",
+   "self_type" : "type-696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31530,63 +32254,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-734",
+   "self_type" : "type-734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31596,8 +32320,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31607,74 +32331,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-688",
-   "self_type" : "type-688",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31684,63 +32408,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31750,8 +32474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31761,96 +32485,96 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "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-924",
-   "self_type" : "type-924",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-46" ],
    "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-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-56" ],
    "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-696",
-   "self_type" : "type-696",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31860,63 +32584,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-785",
+   "self_type" : "type-785",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31926,8 +32650,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31937,44 +32661,44 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -31984,7 +32708,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-515"
+     "referenced_type" : "type-518"
     },
     {
      "access" : "private",
@@ -31996,11 +32720,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-201" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32022,8 +32746,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -32036,7 +32760,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-501"
     },
     {
      "access" : "private",
@@ -32048,11 +32772,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-496" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32087,18 +32811,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -32114,18 +32838,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1061"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1068",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -32136,7 +32860,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1065"
     },
     {
      "field_name" : "num_planes",
@@ -32146,13 +32870,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1015"
+     "referenced_type" : "type-1067"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -32163,48 +32887,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-107"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1063"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -32215,38 +32939,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1071",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -32257,18 +32981,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -32279,43 +33003,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1061"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32325,13 +33049,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -32342,35 +33066,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-395"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-398"
+     "referenced_type" : "type-400"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-401"
     }
    ],
    "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-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-394",
+   "self_type" : "type-394",
    "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)"
@@ -32391,8 +33115,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -32403,43 +33127,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -32450,32 +33174,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -32485,13 +33209,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -32502,32 +33226,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -32537,13 +33261,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -32554,17 +33278,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -32594,13 +33318,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -32611,28 +33335,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -32644,8 +33368,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32653,8 +33377,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-585",
-   "self_type" : "type-587",
+   "referenced_type" : "type-604",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32662,8 +33386,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1236",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32671,8 +33395,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-247",
+   "referenced_type" : "type-247",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32680,8 +33404,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-431",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32689,8 +33413,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "type-649",
+   "self_type" : "type-651",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32698,8 +33422,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-563",
-   "self_type" : "type-580",
+   "referenced_type" : "type-557",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32707,8 +33431,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-624",
-   "self_type" : "type-627",
+   "referenced_type" : "type-630",
+   "self_type" : "type-640",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32716,8 +33440,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-244",
-   "self_type" : "type-545",
+   "referenced_type" : "type-249",
+   "self_type" : "type-540",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32725,8 +33449,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-609",
+   "referenced_type" : "type-248",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32734,8 +33458,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-161",
-   "self_type" : "type-831",
+   "referenced_type" : "type-166",
+   "self_type" : "type-873",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32743,8 +33467,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-829",
-   "self_type" : "type-835",
+   "referenced_type" : "type-871",
+   "self_type" : "type-877",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32752,8 +33476,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-376",
-   "self_type" : "type-388",
+   "referenced_type" : "type-373",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32761,8 +33485,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-209",
-   "self_type" : "type-222",
+   "referenced_type" : "type-214",
+   "self_type" : "type-227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32770,8 +33494,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-213",
-   "self_type" : "type-416",
+   "referenced_type" : "type-218",
+   "self_type" : "type-431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32779,8 +33503,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-465",
-   "self_type" : "type-479",
+   "referenced_type" : "type-461",
+   "self_type" : "type-466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32788,8 +33512,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32797,8 +33521,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-187",
-   "self_type" : "type-239",
+   "referenced_type" : "type-192",
+   "self_type" : "type-244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32806,8 +33530,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-408",
+   "self_type" : "type-441",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32815,8 +33539,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-592",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32824,8 +33548,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-491",
-   "self_type" : "type-499",
+   "referenced_type" : "type-497",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32833,8 +33557,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-1228",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32842,8 +33566,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-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32851,8 +33575,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-511",
-   "self_type" : "type-510",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32860,8 +33584,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-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32869,8 +33593,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-979",
-   "self_type" : "type-978",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32878,8 +33602,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32887,8 +33611,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32896,8 +33620,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32905,8 +33629,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "type-537",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32914,8 +33638,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-990",
-   "self_type" : "type-989",
+   "referenced_type" : "type-698",
+   "self_type" : "type-697",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32923,8 +33647,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32932,8 +33656,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1280",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32941,8 +33665,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-290",
+   "self_type" : "type-289",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32950,8 +33674,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-662",
-   "self_type" : "type-661",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32959,8 +33683,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }

diff --git a/Q/64/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump
index 2c5bb82..11980d9 100644
--- a/Q/64/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-394",
+   "referenced_type" : "type-57",
+   "self_type" : "type-397",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-57",
+   "self_type" : "type-1320",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-807",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1388",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-41",
-   "self_type" : "type-166",
+   "referenced_type" : "type-27",
+   "self_type" : "type-171",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1045",
+   "self_type" : "type-1086",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-90",
-   "self_type" : "type-977",
+   "self_type" : "type-1011",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-391",
+   "self_type" : "type-394",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1307",
+   "self_type" : "type-1380",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1
   },
   {
@@ -79,8 +88,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1
   },
   {
@@ -89,8 +98,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -105,8 +114,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 4
   },
   {
@@ -114,8 +123,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -123,16 +132,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 2
   },
   {
@@ -158,8 +167,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-864",
+   "self_type" : "type-864",
    "size" : 1
   },
   {
@@ -188,8 +197,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4
   },
   {
@@ -208,15 +217,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -360,6 +369,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -483,6 +495,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -534,6 +549,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -1002,6 +1020,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1041,6 +1062,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1056,6 +1080,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1074,6 +1101,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1637,8 +1670,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1327",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1655,8 +1688,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1673,8 +1706,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1699,11 +1732,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1729,11 +1762,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1751,8 +1784,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1777,11 +1810,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1831,11 +1864,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1885,8 +1918,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1907,8 +1940,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1941,8 +1974,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1971,8 +2004,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2005,8 +2038,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2031,8 +2064,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2061,8 +2094,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2127,8 +2160,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2271,8 +2304,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2330,6 +2363,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2451,11 +2522,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1112",
    "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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2469,11 +2540,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2495,8 +2566,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "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-90",
@@ -2599,8 +2670,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2625,8 +2696,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2667,8 +2738,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2909,8 +2980,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-1292",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2939,8 +3010,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2969,8 +3040,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3011,8 +3082,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3049,8 +3120,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3075,8 +3146,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3093,8 +3164,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3123,8 +3194,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3217,8 +3288,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3259,8 +3330,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3277,8 +3348,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3307,8 +3378,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3341,8 +3412,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3395,8 +3466,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3412,18 +3483,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
-    },
-    {
-     "referenced_type" : "type-62"
-    },
-    {
      "referenced_type" : "type-42"
+    },
+    {
+     "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-41",
+   "return_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3433,12 +3504,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1319",
-   "return_type" : "type-41",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1392",
+   "return_type" : "type-27",
+   "self_type" : "type-1392",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3448,27 +3519,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1083"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1198"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1162",
-   "return_type" : "type-43",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1196",
+   "return_type" : "type-29",
+   "self_type" : "type-1196",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3481,14 +3552,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3498,16 +3569,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3517,13 +3588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1532"
+     "referenced_type" : "type-1605"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3533,13 +3604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1533"
+     "referenced_type" : "type-1606"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3549,14 +3620,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3566,13 +3637,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3582,13 +3653,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1534"
+     "referenced_type" : "type-1607"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3598,14 +3669,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3615,13 +3686,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1535"
+     "referenced_type" : "type-1608"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3631,10 +3702,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3644,10 +3715,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3656,13 +3727,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3672,10 +3743,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3685,16 +3756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3703,14 +3774,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3719,14 +3790,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3735,14 +3806,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3751,14 +3822,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3769,13 +3840,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-1540"
+     "referenced_type" : "type-1613"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3785,13 +3856,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3801,13 +3872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3817,14 +3888,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3834,16 +3905,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3853,13 +3924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1568"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3869,13 +3940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1569"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3885,14 +3956,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3902,13 +3973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3918,13 +3989,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-1643"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3934,14 +4005,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3951,13 +4022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-1644"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3967,10 +4038,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3980,10 +4051,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3992,13 +4063,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4008,10 +4079,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4021,16 +4092,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4039,14 +4110,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-234"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4055,14 +4126,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-240"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4071,14 +4142,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4087,14 +4158,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4105,13 +4176,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-1575"
+     "referenced_type" : "type-1648"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4121,13 +4192,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4137,13 +4208,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4153,16 +4224,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -4170,10 +4241,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1578"
+     "referenced_type" : "type-1651"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4184,13 +4255,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-1652"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4199,19 +4270,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1580"
+     "referenced_type" : "type-1653"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4220,19 +4291,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1581"
+     "referenced_type" : "type-1654"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1207"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-1655"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4241,19 +4333,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1582"
+     "referenced_type" : "type-1656"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4262,19 +4354,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1583"
+     "referenced_type" : "type-1657"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4283,19 +4375,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1584"
+     "referenced_type" : "type-1658"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4304,19 +4396,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1659"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4325,19 +4417,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1660"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4348,10 +4440,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4361,13 +4453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4377,13 +4469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4393,10 +4485,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4406,10 +4498,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4419,10 +4511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4432,13 +4524,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-1661"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4448,13 +4540,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4464,16 +4556,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4483,13 +4575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4499,16 +4591,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4518,13 +4610,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4534,13 +4626,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4550,13 +4642,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4566,13 +4658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1590"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4582,13 +4674,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4598,28 +4690,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4629,16 +4721,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4648,13 +4740,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4664,13 +4756,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4680,13 +4772,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4696,16 +4788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4715,19 +4807,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4737,16 +4829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1597"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4756,16 +4848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4775,13 +4867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1598"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4791,16 +4883,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1599"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4810,13 +4902,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4826,13 +4918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4842,28 +4934,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1675"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4873,28 +4965,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1676"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4904,16 +4996,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1677"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4923,13 +5015,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4939,16 +5031,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4958,19 +5050,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1678"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4980,13 +5072,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-598"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-425"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4996,16 +5110,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5015,13 +5129,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1679"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5031,19 +5145,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1680"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5053,13 +5167,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1681"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5069,16 +5183,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1682"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5088,10 +5202,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5101,13 +5215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5117,16 +5231,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5136,13 +5250,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5152,16 +5266,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5171,10 +5285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5184,10 +5298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5197,10 +5311,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5210,16 +5324,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1683"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5228,16 +5342,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5246,31 +5360,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5280,19 +5394,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1539"
+    },
+    {
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5302,16 +5440,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5320,16 +5458,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5338,16 +5476,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5357,13 +5495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5372,19 +5510,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5393,22 +5531,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5417,16 +5555,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1691"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5436,10 +5574,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5449,22 +5587,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1692"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5474,16 +5612,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5493,25 +5631,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1693"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5521,25 +5659,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1694"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5549,25 +5687,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1695"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5577,25 +5715,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1622"
+     "referenced_type" : "type-1696"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5605,19 +5743,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1426"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5627,13 +5765,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5643,13 +5781,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5659,14 +5797,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5676,16 +5814,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5695,13 +5833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1623"
+     "referenced_type" : "type-1697"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5711,13 +5849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1698"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5727,14 +5865,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5744,13 +5882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5760,13 +5898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1699"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5776,14 +5914,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5793,13 +5931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1626"
+     "referenced_type" : "type-1700"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5809,10 +5947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5822,10 +5960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5834,13 +5972,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5850,10 +5988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5863,16 +6001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5881,14 +6019,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1517"
+     "referenced_type" : "type-1588"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5897,14 +6035,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5913,14 +6051,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5930,16 +6068,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -5947,10 +6085,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1627"
+     "referenced_type" : "type-1701"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5961,13 +6099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-1628"
+     "referenced_type" : "type-1702"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5976,19 +6114,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5999,10 +6137,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6012,13 +6150,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6028,13 +6166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6044,10 +6182,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6057,10 +6195,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6070,10 +6208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6083,16 +6221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6102,19 +6240,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6124,13 +6262,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6140,13 +6278,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6156,13 +6294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6172,13 +6310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6188,13 +6326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6204,10 +6342,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6217,10 +6355,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6230,13 +6368,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6246,13 +6384,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6262,19 +6400,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6283,22 +6421,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6308,10 +6446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6321,16 +6459,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6340,13 +6478,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6356,13 +6494,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6373,13 +6511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6389,13 +6527,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6405,13 +6543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6421,14 +6559,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6438,16 +6576,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6457,13 +6595,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6473,13 +6611,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1717"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6489,14 +6627,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6506,13 +6644,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6522,13 +6660,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6538,14 +6676,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6555,13 +6693,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1719"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6571,10 +6709,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6584,10 +6722,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6596,13 +6734,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6612,10 +6750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6625,16 +6763,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6647,10 +6785,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6659,14 +6797,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6675,14 +6813,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6691,14 +6829,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6709,13 +6847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1723"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6725,13 +6863,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6741,13 +6879,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6757,16 +6895,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -6774,10 +6912,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1726"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6788,13 +6926,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1727"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6803,19 +6941,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-1728"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6826,10 +6964,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6839,13 +6977,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6855,13 +6993,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6871,10 +7009,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6884,10 +7022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6897,10 +7035,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6910,40 +7048,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1655"
+     "referenced_type" : "type-1729"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6953,16 +7091,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6972,13 +7110,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1656"
+     "referenced_type" : "type-1730"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6988,13 +7126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1731"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7004,13 +7142,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7020,13 +7158,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1732"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7036,7 +7174,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
      "referenced_type" : "type-2"
@@ -7045,7 +7183,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7054,43 +7192,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1733"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7100,13 +7238,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7116,13 +7254,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1734"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7132,16 +7270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-939"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7151,10 +7289,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7164,10 +7302,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7177,13 +7315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7193,10 +7331,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7206,16 +7344,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-1535"
+    },
+    {
+     "referenced_type" : "type-1100"
+    },
+    {
      "referenced_type" : "type-1461"
-    },
-    {
-     "referenced_type" : "type-1068"
-    },
-    {
-     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7225,40 +7363,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1735"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7268,13 +7406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7284,13 +7422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7300,16 +7438,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -7317,10 +7455,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1736"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7331,13 +7469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1737"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7348,10 +7486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7361,13 +7499,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7377,13 +7515,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7393,10 +7531,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7406,10 +7544,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7419,10 +7557,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7432,16 +7570,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7451,19 +7589,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1738"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7473,13 +7611,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1739"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7489,13 +7627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1740"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7505,13 +7643,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7521,13 +7659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1741"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7537,13 +7675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7553,10 +7691,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7566,10 +7704,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7579,13 +7717,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7595,10 +7733,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7608,16 +7746,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7627,13 +7765,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7643,13 +7781,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7659,14 +7797,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7676,16 +7814,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7695,13 +7833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1669"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7711,13 +7849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1670"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7727,14 +7865,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7744,13 +7882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7760,13 +7898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7776,14 +7914,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7793,13 +7931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1672"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7809,10 +7947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7822,10 +7960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7834,13 +7972,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7850,10 +7988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7863,16 +8001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7881,14 +8019,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7897,14 +8035,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7913,14 +8051,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7931,13 +8069,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-1675"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7947,13 +8085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7963,13 +8101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7979,16 +8117,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -7996,10 +8134,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8010,13 +8148,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1207"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-1754"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8025,19 +8184,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1755"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8048,10 +8207,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8061,13 +8220,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8077,13 +8236,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8093,10 +8252,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8106,10 +8265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8119,10 +8278,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8132,16 +8291,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8151,13 +8310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1756"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8167,13 +8326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1757"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8183,13 +8342,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8199,13 +8358,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1758"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8215,19 +8374,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8237,13 +8418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1759"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8253,16 +8434,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8272,13 +8453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8288,10 +8469,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8301,10 +8482,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1539"
+    },
+    {
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8313,16 +8518,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8332,10 +8537,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8345,16 +8550,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8364,19 +8569,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1426"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8386,13 +8591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8402,33 +8607,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-210", "type-404" ]
+   "template_args" : [ "type-409", "type-215", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8436,18 +8683,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-404" ]
+   "template_args" : [ "type-409", "type-410", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8455,18 +8702,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-404" ]
+   "template_args" : [ "type-409", "type-5", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8474,18 +8721,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-190", "type-202" ]
+   "template_args" : [ "type-193", "type-195", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8493,18 +8740,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-189", "type-202" ]
+   "template_args" : [ "type-193", "type-194", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8512,18 +8759,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-5", "type-202" ]
+   "template_args" : [ "type-193", "type-5", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8531,18 +8778,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-133", "type-138" ]
+   "template_args" : [ "type-139", "type-140", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8550,18 +8797,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-5", "type-138" ]
+   "template_args" : [ "type-139", "type-5", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8569,18 +8816,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-413", "type-1419" ]
+   "template_args" : [ "type-461", "type-417", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8588,18 +8835,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-439", "type-1419" ]
+   "template_args" : [ "type-461", "type-444", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8607,18 +8854,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-5", "type-1419" ]
+   "template_args" : [ "type-461", "type-5", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8626,18 +8873,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-214", "type-602" ]
+   "template_args" : [ "type-623", "type-219", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8645,18 +8892,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-5", "type-602" ]
+   "template_args" : [ "type-623", "type-5", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8664,12 +8911,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
-   "return_type" : "type-208",
+   "return_type" : "type-213",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-210", "type-43" ]
+   "template_args" : [ "type-215", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8677,12 +8924,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-375",
+   "return_type" : "type-372",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-133", "type-43" ]
+   "template_args" : [ "type-140", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8690,12 +8937,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
-   "return_type" : "type-212",
+   "return_type" : "type-217",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-214", "type-43" ]
+   "template_args" : [ "type-219", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8703,18 +8950,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-404", "type-384", "type-43", "type-43" ]
+   "template_args" : [ "type-421", "type-409", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8722,18 +8969,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-188", "type-43", "type-43" ]
+   "template_args" : [ "type-207", "type-193", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8741,18 +8988,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-138", "type-132", "type-43", "type-43" ]
+   "template_args" : [ "type-143", "type-139", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8760,18 +9007,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1419", "type-462", "type-43", "type-43" ]
+   "template_args" : [ "type-1493", "type-461", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8779,18 +9026,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-602", "type-593", "type-43", "type-43" ]
+   "template_args" : [ "type-632", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8798,31 +9045,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8832,8 +9079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8841,8 +9088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8850,8 +9097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1151",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8859,8 +9106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8868,8 +9115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1550",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8877,8 +9124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-584",
-   "self_type" : "type-589",
+   "referenced_type" : "type-603",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8886,8 +9133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8895,8 +9142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-241",
-   "self_type" : "type-247",
+   "referenced_type" : "type-246",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8904,8 +9151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8913,8 +9160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-617",
-   "self_type" : "type-621",
+   "referenced_type" : "type-648",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8922,8 +9169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-561",
-   "self_type" : "type-580",
+   "referenced_type" : "type-552",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8931,8 +9178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-627",
+   "referenced_type" : "type-629",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8940,8 +9187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-243",
-   "self_type" : "type-550",
+   "referenced_type" : "type-248",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8949,8 +9196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8958,8 +9205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8967,8 +9214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8976,8 +9223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8985,8 +9232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8994,8 +9241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9003,8 +9250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9012,8 +9259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9021,8 +9268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9030,8 +9277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9039,8 +9286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9048,8 +9295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-936",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9057,8 +9304,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-697",
+   "referenced_type" : "type-483",
+   "self_type" : "type-751",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9066,8 +9322,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-973",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9075,8 +9331,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-954",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9084,8 +9340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-683",
+   "referenced_type" : "type-104",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9093,8 +9349,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-701",
+   "referenced_type" : "type-486",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-123",
+   "self_type" : "type-614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9102,8 +9367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-976",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9111,8 +9376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-937",
+   "referenced_type" : "type-929",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9121,7 +9386,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-80",
-   "self_type" : "type-1430",
+   "self_type" : "type-1503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9129,8 +9394,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-467",
-   "self_type" : "type-647",
+   "referenced_type" : "type-482",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9138,8 +9412,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-972",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9147,8 +9421,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-953",
-   "self_type" : "type-971",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9156,8 +9430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-645",
+   "referenced_type" : "type-103",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9165,8 +9439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-380",
+   "referenced_type" : "type-372",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9174,8 +9448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-220",
+   "referenced_type" : "type-213",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9183,8 +9457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-414",
+   "referenced_type" : "type-217",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9192,8 +9466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-460",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9201,8 +9475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9210,8 +9484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-239",
+   "referenced_type" : "type-191",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9219,8 +9493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-407",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9228,8 +9502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9237,8 +9511,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-490",
-   "self_type" : "type-501",
+   "referenced_type" : "type-496",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9246,8 +9520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9255,8 +9529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9264,8 +9538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1206",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9273,8 +9547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-609",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9282,8 +9556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-537",
+   "referenced_type" : "type-537",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9291,8 +9565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9300,8 +9574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-167",
+   "referenced_type" : "type-162",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9309,8 +9583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9318,8 +9592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-464",
-   "self_type" : "type-578",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9327,8 +9601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-151",
-   "self_type" : "type-153",
+   "referenced_type" : "type-156",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9336,8 +9610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9345,8 +9619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9354,8 +9628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9363,8 +9637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9372,17 +9646,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-574",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9390,8 +9673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9399,8 +9682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-934",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9408,8 +9691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-917",
+   "referenced_type" : "type-919",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9417,8 +9700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9426,8 +9709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-503",
+   "referenced_type" : "type-480",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9435,8 +9718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1592",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9444,8 +9727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9453,8 +9736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1583",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9462,17 +9745,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1387",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1461",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9480,8 +9772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-502",
+   "referenced_type" : "type-504",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9489,8 +9781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9498,8 +9790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9507,8 +9799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9516,8 +9808,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-1249",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1284",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9525,8 +9817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9534,7 +9826,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9543,8 +9835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-401",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-405",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9552,8 +9844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-228",
-   "self_type" : "type-229",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9561,8 +9853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-207",
-   "self_type" : "type-211",
+   "referenced_type" : "type-212",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9570,8 +9862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-217",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9579,8 +9871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-445",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9588,8 +9880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-234",
-   "self_type" : "type-235",
+   "referenced_type" : "type-239",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9597,8 +9889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9606,8 +9898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9615,8 +9907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9624,8 +9916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-191",
+   "referenced_type" : "type-190",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9633,8 +9925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-386",
+   "referenced_type" : "type-406",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9642,8 +9934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-590",
-   "self_type" : "type-594",
+   "referenced_type" : "type-620",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9651,8 +9943,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-507",
-   "self_type" : "type-858",
+   "referenced_type" : "type-515",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9660,8 +9952,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-980",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9669,8 +9961,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-1462",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9678,8 +9970,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-364",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-369",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9687,8 +9979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9696,8 +9988,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-1445",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9705,8 +9997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-296",
-   "self_type" : "type-847",
+   "referenced_type" : "type-297",
+   "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9714,8 +10006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-877",
+   "referenced_type" : "type-908",
+   "self_type" : "type-909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9723,8 +10015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-875",
+   "referenced_type" : "type-906",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9732,101 +10024,101 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1363",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1027",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1115",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1215",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1305",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1564",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
    "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-661",
+   "self_type" : "type-663",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-789",
-   "self_type" : "type-791",
+   "referenced_type" : "type-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-867",
-   "self_type" : "type-869",
+   "referenced_type" : "type-843",
+   "self_type" : "type-845",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-920",
+   "self_type" : "type-922",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-966",
+   "referenced_type" : "type-952",
+   "self_type" : "type-962",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-484",
+   "referenced_type" : "type-391",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9834,8 +10126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-861",
+   "referenced_type" : "type-899",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9843,8 +10135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-855",
+   "referenced_type" : "type-884",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9852,8 +10144,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-848",
-   "self_type" : "type-853",
+   "referenced_type" : "type-863",
+   "self_type" : "type-871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9861,8 +10153,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-1075",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9870,8 +10162,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-1169",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1134",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9879,8 +10171,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-1202",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9888,71 +10180,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-1520",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-282",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-525",
+   "self_type" : "type-527",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-687",
+   "self_type" : "type-689",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-860",
+   "self_type" : "type-862",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-937",
+   "self_type" : "type-940",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1000",
+   "self_type" : "type-999",
+   "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-1091",
+   "self_type" : "type-1090",
+   "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-1200",
+   "self_type" : "type-1199",
+   "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-1357",
+   "self_type" : "type-1356",
+   "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-1512",
+   "self_type" : "type-1511",
+   "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-1523",
    "self_type" : "type-1522",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-504",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-984",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+   "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-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-188",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9960,8 +10306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-402",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9969,8 +10315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9978,8 +10324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-822",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9987,8 +10333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9996,62 +10342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-182",
-   "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-378",
-   "self_type" : "type-377",
-   "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-587",
-   "self_type" : "type-705",
-   "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-768",
-   "self_type" : "type-767",
-   "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-845",
-   "self_type" : "type-844",
-   "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-851",
-   "self_type" : "type-850",
-   "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-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10059,8 +10351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10068,8 +10360,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-859",
+   "referenced_type" : "type-37",
+   "self_type" : "type-895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10077,8 +10369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-865",
-   "self_type" : "type-866",
+   "referenced_type" : "type-904",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10086,8 +10378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-856",
-   "self_type" : "type-857",
+   "referenced_type" : "type-892",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10095,8 +10387,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1121",
    "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"
   },
@@ -10105,7 +10397,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1345",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -10114,7 +10406,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1358",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -10125,8 +10417,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -10134,8 +10426,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10143,8 +10435,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1323",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10152,8 +10444,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10161,8 +10453,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10170,8 +10462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10180,7 +10472,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-889",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10188,8 +10480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10197,8 +10489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10206,8 +10498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10215,8 +10507,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10224,8 +10516,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-250",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10233,8 +10525,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10242,8 +10534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10251,8 +10543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10260,8 +10552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10269,8 +10561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-839",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10287,8 +10579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10305,8 +10597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-878",
-   "self_type" : "type-881",
+   "referenced_type" : "type-910",
+   "self_type" : "type-911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10314,8 +10606,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10323,8 +10615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10332,8 +10624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10341,8 +10633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-296",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10350,8 +10642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-657",
+   "referenced_type" : "type-643",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10359,8 +10651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-510",
+   "referenced_type" : "type-200",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10368,8 +10660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10377,8 +10669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10386,8 +10678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-272",
+   "referenced_type" : "type-210",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10395,8 +10687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-498",
+   "referenced_type" : "type-424",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10404,17 +10696,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-651",
+   "referenced_type" : "type-635",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-1221",
+   "self_type" : "type-1335",
+   "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-1236",
+   "self_type" : "type-1354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1229",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10422,8 +10732,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-1279",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10431,8 +10741,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-1265",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10440,8 +10750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10449,8 +10759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10467,8 +10777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10476,8 +10786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10485,8 +10795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10494,8 +10804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10503,8 +10813,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "type-603",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10512,8 +10822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10521,8 +10831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-245",
+   "referenced_type" : "type-246",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10530,8 +10840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10539,8 +10849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-618",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10548,8 +10858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-561",
-   "self_type" : "type-575",
+   "referenced_type" : "type-552",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10557,8 +10867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-624",
+   "referenced_type" : "type-629",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10566,17 +10876,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-523",
+   "referenced_type" : "type-248",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1319",
+   "self_type" : "type-1344",
+   "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-1351",
+   "self_type" : "type-1355",
+   "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-1359",
+   "self_type" : "type-1360",
+   "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-146",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-151",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10584,8 +10921,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-696",
+   "referenced_type" : "type-483",
+   "self_type" : "type-750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10593,8 +10939,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-973",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10602,8 +10948,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-954",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10611,8 +10957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-672",
+   "referenced_type" : "type-104",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10620,8 +10966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-606",
+   "referenced_type" : "type-247",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10629,8 +10975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1477",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10638,8 +10984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1470",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10647,8 +10993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-352",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10656,8 +11002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-338",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10665,8 +11011,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
+   "referenced_type" : "type-338",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10674,8 +11020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10683,8 +11029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-376",
+   "referenced_type" : "type-140",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10692,8 +11038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-226",
+   "referenced_type" : "type-195",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10701,8 +11047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-215",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10710,8 +11056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-219",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10719,8 +11065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10728,8 +11074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10737,8 +11083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10746,8 +11092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10755,8 +11101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10764,8 +11110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-355",
+   "referenced_type" : "type-359",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10773,8 +11119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-563",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10783,7 +11129,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-74",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10818,8 +11164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10827,8 +11173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-232",
+   "referenced_type" : "type-194",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10836,8 +11182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-418",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10845,8 +11191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10854,8 +11200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10863,8 +11209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-197",
+   "referenced_type" : "type-197",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10872,8 +11218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-399",
+   "referenced_type" : "type-414",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10881,8 +11227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10890,8 +11236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10899,8 +11245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-143",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10908,8 +11254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-206",
+   "referenced_type" : "type-207",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10917,8 +11263,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-404",
-   "self_type" : "type-409",
+   "referenced_type" : "type-421",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10926,8 +11272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "type-632",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10935,8 +11281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10944,8 +11290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1533",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10953,8 +11299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-201",
+   "referenced_type" : "type-203",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10962,8 +11308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10971,8 +11317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-601",
+   "referenced_type" : "type-630",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10980,8 +11326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10989,8 +11335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-139",
+   "self_type" : "type-1527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10998,8 +11344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "type-193",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11007,8 +11353,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11016,17 +11362,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-123",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11034,8 +11389,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11043,8 +11398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-491",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11052,8 +11407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-501",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11061,8 +11416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-929",
+   "referenced_type" : "type-929",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11071,7 +11426,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-80",
-   "self_type" : "type-956",
+   "self_type" : "type-997",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11079,8 +11434,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-646",
+   "referenced_type" : "type-482",
+   "self_type" : "type-671",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11088,8 +11452,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-972",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1014",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11097,8 +11461,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-953",
-   "self_type" : "type-961",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11106,8 +11470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-370",
+   "referenced_type" : "type-103",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11115,8 +11479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11124,8 +11488,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-198",
+   "self_type" : "type-1207",
    "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"
   },
@@ -11142,8 +11506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11151,8 +11515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11169,8 +11533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-29",
+   "referenced_type" : "type-16",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11178,8 +11542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-260",
+   "referenced_type" : "type-24",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11187,8 +11551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-416",
+   "referenced_type" : "type-415",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11196,8 +11560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11205,8 +11569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
+   "referenced_type" : "type-230",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11214,8 +11578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-219",
+   "referenced_type" : "type-213",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11223,8 +11587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11232,8 +11596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-440",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11241,8 +11605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11250,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11259,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11268,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11277,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-237",
+   "referenced_type" : "type-191",
+   "self_type" : "type-242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11286,8 +11650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-407",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11295,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11304,8 +11668,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-490",
-   "self_type" : "type-489",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11313,8 +11677,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-194",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11322,8 +11686,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-265",
-   "self_type" : "type-278",
+   "referenced_type" : "type-268",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11331,8 +11695,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-352",
-   "self_type" : "type-363",
+   "referenced_type" : "type-335",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11340,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11349,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-625",
+   "referenced_type" : "type-528",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11358,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-916",
+   "referenced_type" : "type-499",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11368,7 +11732,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1442",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11376,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11385,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11394,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-609",
+   "referenced_type" : "type-57",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11403,8 +11767,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1085",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11412,8 +11776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-885",
+   "referenced_type" : "type-912",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11421,8 +11785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-43",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11430,8 +11794,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11439,8 +11803,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11448,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11457,8 +11821,8 @@
    "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-1217",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11466,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11475,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11484,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11493,8 +11857,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1558",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11502,8 +11866,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-249",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11511,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11520,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-656",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11529,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-584",
+   "self_type" : "type-599",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11538,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-558",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11547,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-699",
+   "referenced_type" : "type-752",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11556,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11565,8 +11929,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-181",
+   "referenced_type" : "type-181",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11574,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
+   "referenced_type" : "type-125",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11583,8 +11947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-175",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11592,8 +11956,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-171",
+   "referenced_type" : "type-175",
+   "self_type" : "type-176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11601,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11610,8 +11983,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-1427",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11619,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11628,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11637,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11646,8 +12019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-614",
+   "referenced_type" : "type-619",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11655,8 +12028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11664,8 +12037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11673,8 +12046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "referenced_type" : "type-357",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11682,8 +12055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11691,8 +12064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-336",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11700,8 +12073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11709,8 +12082,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11718,8 +12091,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-317",
+   "referenced_type" : "type-321",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11727,8 +12100,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-223",
-   "self_type" : "type-224",
+   "referenced_type" : "type-228",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11736,8 +12109,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-319",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11745,8 +12118,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11754,8 +12127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11763,8 +12136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11772,8 +12145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11781,8 +12154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "type-590",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11790,8 +12163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11799,8 +12172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-323",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11808,8 +12181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11817,8 +12190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11826,8 +12199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-150",
+   "referenced_type" : "type-142",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11835,8 +12208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11844,8 +12217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-569",
-   "self_type" : "type-570",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11853,8 +12226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-746",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11862,8 +12235,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11871,8 +12244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-134",
+   "referenced_type" : "type-138",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11880,8 +12253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
+   "referenced_type" : "type-333",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11889,8 +12262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11898,17 +12271,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-692",
+   "referenced_type" : "type-743",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11916,8 +12298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11925,8 +12307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-942",
+   "referenced_type" : "type-934",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11934,8 +12316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11943,8 +12325,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-466",
+   "referenced_type" : "type-480",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11952,8 +12334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11961,8 +12343,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1575",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11970,8 +12352,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11979,8 +12361,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1579",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11988,8 +12379,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11997,8 +12388,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12006,8 +12397,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12015,8 +12406,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12024,8 +12415,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1467",
    "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"
   },
@@ -12033,8 +12424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12042,8 +12433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-288",
+   "referenced_type" : "type-290",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12051,8 +12442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1413",
    "size" : 4,
    "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"
   },
@@ -12060,8 +12451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-49",
+   "self_type" : "type-1537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12069,8 +12460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-264",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12078,7 +12469,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -12087,8 +12478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12096,8 +12487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12105,8 +12496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-222",
+   "referenced_type" : "type-212",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12114,8 +12505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-218",
+   "referenced_type" : "type-221",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12123,8 +12514,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-451",
+   "referenced_type" : "type-453",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12132,8 +12523,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-236",
+   "referenced_type" : "type-239",
+   "self_type" : "type-241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12141,8 +12532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12150,8 +12541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12159,8 +12550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12168,8 +12559,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-240",
+   "referenced_type" : "type-190",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12177,8 +12568,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-427",
+   "referenced_type" : "type-406",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12186,8 +12577,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-590",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12195,8 +12586,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-507",
-   "self_type" : "type-506",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12204,8 +12595,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-980",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12213,8 +12604,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-1462",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12222,8 +12613,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-283",
-   "self_type" : "type-286",
+   "referenced_type" : "type-281",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12231,8 +12622,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-364",
-   "self_type" : "type-371",
+   "referenced_type" : "type-369",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12240,8 +12631,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12249,8 +12640,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-944",
-   "self_type" : "type-957",
+   "referenced_type" : "type-951",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12258,8 +12649,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-1445",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12267,8 +12658,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12276,8 +12667,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12285,7 +12676,7 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-391",
    "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -12294,8 +12685,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12303,8 +12694,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12312,8 +12703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-865",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12321,8 +12712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1098",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12330,8 +12721,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12339,8 +12730,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1024",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12348,8 +12739,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-582",
+   "referenced_type" : "type-392",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12357,8 +12748,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-644",
+   "referenced_type" : "type-170",
+   "self_type" : "type-654",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12367,7 +12758,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-90",
-   "self_type" : "type-104",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12376,7 +12767,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1519",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12385,7 +12776,7 @@
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
    "referenced_type" : "type-83",
-   "self_type" : "type-1160",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12393,8 +12784,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12402,8 +12793,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12411,8 +12802,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-42",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12424,8 +12815,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12434,8 +12825,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12444,8 +12835,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12454,8 +12845,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12464,8 +12855,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-250",
-   "self_type" : "type-252",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12474,8 +12865,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-441",
-   "self_type" : "type-443",
+   "referenced_type" : "type-255",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12484,8 +12875,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
+   "referenced_type" : "type-456",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12494,8 +12885,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-714",
-   "self_type" : "type-716",
+   "referenced_type" : "type-658",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12504,8 +12895,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-785",
-   "self_type" : "type-787",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12514,8 +12905,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
+   "referenced_type" : "type-838",
+   "self_type" : "type-841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12534,8 +12925,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-958",
-   "self_type" : "type-960",
+   "referenced_type" : "type-916",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12544,8 +12935,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-144",
+   "referenced_type" : "type-17",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12554,8 +12945,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-643",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-653",
+   "self_type" : "type-1106",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12565,7 +12956,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-882",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12574,8 +12965,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12584,8 +12975,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12594,8 +12985,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-50",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-36",
+   "self_type" : "type-1361",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12604,8 +12995,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-143",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-148",
+   "self_type" : "type-1174",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12614,8 +13005,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-1206",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1229",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12624,8 +13015,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-1220",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1245",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12634,8 +13025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1205",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12644,8 +13035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1551",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12654,8 +13045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-584",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-607",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12664,8 +13055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1557",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12674,8 +13065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-241",
-   "self_type" : "type-248",
+   "referenced_type" : "type-246",
+   "self_type" : "type-253",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12684,8 +13075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12694,8 +13085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-617",
-   "self_type" : "type-622",
+   "referenced_type" : "type-648",
+   "self_type" : "type-656",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12704,8 +13095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-581",
+   "referenced_type" : "type-552",
+   "self_type" : "type-584",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12714,8 +13105,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-526",
+   "referenced_type" : "type-248",
+   "self_type" : "type-537",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12724,8 +13115,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12734,8 +13125,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-698",
+   "referenced_type" : "type-483",
+   "self_type" : "type-752",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12744,8 +13135,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12754,8 +13145,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12765,7 +13156,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-135",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12775,7 +13166,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-76",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12785,7 +13176,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12794,8 +13195,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-973",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1507",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12804,8 +13205,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-954",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1501",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12814,8 +13215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12824,8 +13225,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-1002",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12834,8 +13235,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-104",
+   "self_type" : "type-1437",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12844,8 +13245,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-242",
-   "self_type" : "type-610",
+   "referenced_type" : "type-247",
+   "self_type" : "type-619",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12854,8 +13255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1482",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12864,8 +13265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12874,8 +13275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-354",
+   "self_type" : "type-357",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12884,8 +13285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-350",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12894,8 +13295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-343",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12904,8 +13305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1438",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12914,8 +13315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12924,8 +13325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12934,8 +13335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-417",
+   "self_type" : "type-1454",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12944,8 +13345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-408",
+   "referenced_type" : "type-140",
+   "self_type" : "type-411",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12954,8 +13355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-316",
+   "referenced_type" : "type-195",
+   "self_type" : "type-321",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12964,8 +13365,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-223",
+   "referenced_type" : "type-215",
+   "self_type" : "type-228",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12974,8 +13375,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-314",
+   "referenced_type" : "type-219",
+   "self_type" : "type-319",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12984,8 +13385,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12994,8 +13395,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-703",
+   "referenced_type" : "type-486",
+   "self_type" : "type-756",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13004,8 +13405,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-487",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13014,8 +13415,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13024,8 +13425,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-464",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13034,8 +13435,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1436",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13044,8 +13445,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-157",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13054,8 +13455,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13064,8 +13465,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13074,8 +13475,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-185",
+   "self_type" : "type-1571",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13084,8 +13485,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1489",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -13094,8 +13495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-359",
+   "referenced_type" : "type-361",
+   "self_type" : "type-365",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -13104,8 +13505,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-567",
+   "referenced_type" : "type-587",
+   "self_type" : "type-590",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -13115,7 +13516,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-88",
-   "self_type" : "type-112",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13125,7 +13526,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-79",
-   "self_type" : "type-173",
+   "self_type" : "type-178",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13135,7 +13536,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-96",
-   "self_type" : "type-169",
+   "self_type" : "type-174",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13145,7 +13546,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-89",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13155,7 +13556,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-97",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13164,8 +13565,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-444",
+   "self_type" : "type-1456",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -13174,8 +13575,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-318",
+   "referenced_type" : "type-194",
+   "self_type" : "type-323",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -13184,8 +13585,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-549",
+   "referenced_type" : "type-410",
+   "self_type" : "type-570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -13195,7 +13596,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13204,8 +13605,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-573",
+   "referenced_type" : "type-102",
+   "self_type" : "type-597",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13214,8 +13615,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13224,8 +13625,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13234,8 +13635,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-142",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13244,8 +13645,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-361",
+   "referenced_type" : "type-207",
+   "self_type" : "type-367",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -13254,8 +13655,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-569",
+   "referenced_type" : "type-421",
+   "self_type" : "type-593",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13264,8 +13665,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-694",
+   "referenced_type" : "type-632",
+   "self_type" : "type-746",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -13275,7 +13676,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13284,8 +13685,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-461",
+   "self_type" : "type-1458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13294,8 +13695,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-139",
+   "self_type" : "type-138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -13304,8 +13705,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-328",
+   "referenced_type" : "type-193",
+   "self_type" : "type-333",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -13314,8 +13715,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-409",
+   "self_type" : "type-581",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -13324,18 +13725,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-690",
+   "referenced_type" : "type-623",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-119",
-   "self_type" : "type-122",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13345,7 +13766,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13354,8 +13775,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1497",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13364,8 +13785,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-501",
+   "self_type" : "type-1520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13374,8 +13795,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-165",
+   "self_type" : "type-1099",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13384,8 +13805,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-920",
-   "self_type" : "type-935",
+   "referenced_type" : "type-929",
+   "self_type" : "type-934",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13395,7 +13816,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-80",
-   "self_type" : "type-897",
+   "self_type" : "type-919",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13404,8 +13825,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-571",
+   "referenced_type" : "type-482",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13414,8 +13835,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-465",
+   "referenced_type" : "type-473",
+   "self_type" : "type-480",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13424,8 +13845,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1572",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13435,7 +13856,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-84",
-   "self_type" : "type-1501",
+   "self_type" : "type-1574",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13445,7 +13866,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-75",
-   "self_type" : "type-1507",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13455,7 +13876,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-92",
-   "self_type" : "type-1504",
+   "self_type" : "type-1577",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13464,8 +13895,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-953",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13474,8 +13905,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13484,8 +13915,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1032",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13494,8 +13925,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1048",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13504,8 +13935,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13514,8 +13945,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-1390",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1466",
    "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"
   },
@@ -13524,8 +13955,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-1092",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1120",
    "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"
   },
@@ -13535,7 +13966,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-1233",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13544,8 +13975,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-1232",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1279",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13554,8 +13985,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-267",
-   "self_type" : "type-287",
+   "referenced_type" : "type-270",
+   "self_type" : "type-290",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13564,8 +13995,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-1342",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13574,8 +14005,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-1341",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1417",
    "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"
   },
@@ -13584,8 +14015,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-354",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-1412",
    "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"
   },
@@ -13594,8 +14025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13604,8 +14035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13614,8 +14045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-420",
+   "referenced_type" : "type-415",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13624,8 +14055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-401",
+   "referenced_type" : "type-372",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13634,8 +14065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13644,8 +14075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "type-213",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13654,8 +14085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-217",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13664,8 +14095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-444",
+   "referenced_type" : "type-442",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13674,8 +14105,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-231",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13684,8 +14115,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13694,8 +14125,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-486",
+   "referenced_type" : "type-459",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13704,8 +14135,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13714,8 +14145,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "type-191",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13724,8 +14155,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13734,8 +14165,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +14175,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-490",
-   "self_type" : "type-507",
+   "referenced_type" : "type-496",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13754,8 +14185,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-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13764,8 +14195,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-194",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13774,8 +14205,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-265",
-   "self_type" : "type-283",
+   "referenced_type" : "type-268",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13784,8 +14215,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-352",
-   "self_type" : "type-364",
+   "referenced_type" : "type-335",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13794,8 +14225,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13804,8 +14235,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-493",
-   "self_type" : "type-944",
+   "referenced_type" : "type-499",
+   "self_type" : "type-951",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13815,7 +14246,7 @@
    "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-3",
-   "self_type" : "type-1445",
+   "self_type" : "type-1519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13824,8 +14255,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-296",
+   "referenced_type" : "type-39",
+   "self_type" : "type-297",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13834,8 +14265,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13844,8 +14275,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13855,7 +14286,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-91",
-   "self_type" : "type-876",
+   "self_type" : "type-908",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13864,8 +14295,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-807",
-   "self_type" : "type-872",
+   "referenced_type" : "type-835",
+   "self_type" : "type-906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13874,8 +14305,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13883,96 +14314,96 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1213",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1562",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/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-662",
+   "self_type" : "type-661",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-946",
-   "self_type" : "type-945",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13980,8 +14411,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13990,8 +14421,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-860",
+   "referenced_type" : "type-32",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14000,8 +14431,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14010,8 +14441,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-854",
+   "referenced_type" : "type-730",
+   "self_type" : "type-884",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14020,8 +14451,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-849",
-   "self_type" : "type-848",
+   "referenced_type" : "type-864",
+   "self_type" : "type-863",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14030,8 +14461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14040,8 +14471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1165",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14050,8 +14481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1268",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14060,8 +14491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14070,8 +14501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14080,8 +14511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14090,8 +14521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-560",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14100,8 +14531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14110,8 +14541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14120,8 +14551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14130,8 +14561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14140,8 +14571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-915",
-   "self_type" : "type-914",
+   "referenced_type" : "type-977",
+   "self_type" : "type-976",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14150,8 +14581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14160,8 +14591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14170,8 +14601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14180,8 +14611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14190,8 +14621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14200,8 +14631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14210,8 +14641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14220,8 +14651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14230,8 +14661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14240,8 +14671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14250,8 +14681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14260,8 +14691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-905",
-   "self_type" : "type-904",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14270,8 +14701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1065",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14280,8 +14711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14290,8 +14721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1263",
+   "self_type" : "type-1262",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14300,8 +14731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14310,8 +14741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14320,8 +14751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-312",
+   "self_type" : "type-311",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14330,8 +14761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14340,8 +14771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14350,8 +14781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14360,8 +14791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14370,8 +14801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-834",
-   "self_type" : "type-833",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14380,8 +14811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14390,8 +14821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14400,8 +14831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14410,8 +14841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14420,8 +14851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14430,8 +14861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14440,8 +14871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14450,8 +14881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14460,8 +14891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14470,8 +14901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14480,8 +14911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-742",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14490,8 +14921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14500,8 +14931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-968",
+   "self_type" : "type-967",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14510,8 +14941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1063",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14520,8 +14951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14530,8 +14961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14540,8 +14971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14550,8 +14981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14560,8 +14991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14570,8 +15001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14580,8 +15011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14590,8 +15021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14600,8 +15031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14610,8 +15041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-831",
-   "self_type" : "type-830",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14620,8 +15051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-906",
+   "referenced_type" : "type-964",
+   "self_type" : "type-963",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14630,8 +15061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14640,8 +15071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14650,8 +15081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1266",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14660,8 +15091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14670,8 +15101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14680,8 +15111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14690,8 +15121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14700,8 +15131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14710,8 +15141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14720,8 +15151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14730,8 +15161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-838",
-   "self_type" : "type-837",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14740,8 +15171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-913",
-   "self_type" : "type-912",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14750,8 +15181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14760,8 +15191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14770,8 +15201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14780,8 +15211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14790,8 +15221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14800,8 +15231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14810,8 +15241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14820,8 +15251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "type-61",
+   "self_type" : "type-60",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14830,8 +15261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14840,8 +15271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14850,8 +15281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-877",
+   "self_type" : "type-876",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14860,8 +15291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14870,8 +15301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14880,8 +15311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14890,8 +15321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1109",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14900,8 +15331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1272",
+   "self_type" : "type-1271",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14910,8 +15341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14920,8 +15351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14930,8 +15361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-562",
+   "self_type" : "type-561",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14940,8 +15371,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-918",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14950,18 +15401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
-   "size" : 28,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14980,8 +15421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1170",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14990,8 +15431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15000,8 +15441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15010,8 +15451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15020,8 +15461,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15030,18 +15501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
-   "size" : 24,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15060,8 +15521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15070,8 +15531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15080,8 +15541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15090,8 +15551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15100,8 +15561,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15110,8 +15601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15120,8 +15611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1175",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15140,8 +15631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15150,8 +15641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15160,8 +15651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-332",
+   "self_type" : "type-331",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15170,8 +15661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15180,8 +15671,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-926",
-   "self_type" : "type-925",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15190,8 +15701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15200,8 +15711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15210,48 +15721,168 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-137",
+   "self_type" : "type-136",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-993",
+   "self_type" : "type-992",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1280",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-130",
    "self_type" : "type-129",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15260,8 +15891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15270,8 +15901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15280,8 +15911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15290,8 +15921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15300,8 +15931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15310,8 +15941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1180",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15320,8 +15951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-1262",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15330,8 +15961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15340,8 +15971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15350,8 +15981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15360,638 +15991,708 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1034",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::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",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-680",
+   "self_type" : "type-679",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-854",
+   "self_type" : "type-853",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "referenced_type" : "type-931",
    "self_type" : "type-930",
-   "size" : 68,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1117",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::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",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1254",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-707",
+   "self_type" : "type-706",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-875",
+   "self_type" : "type-874",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-705",
+   "self_type" : "type-704",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1039",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1233",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-861",
+   "self_type" : "type-860",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1016",
+   "self_type" : "type-1015",
+   "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-1031",
+   "self_type" : "type-1030",
+   "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-1119",
+   "self_type" : "type-1118",
+   "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-1220",
+   "self_type" : "type-1219",
+   "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-1568",
+   "self_type" : "type-1567",
+   "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-265",
+   "self_type" : "type-264",
+   "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-471",
+   "self_type" : "type-470",
+   "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-667",
+   "self_type" : "type-666",
+   "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-850",
+   "self_type" : "type-849",
+   "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-926",
+   "self_type" : "type-925",
+   "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-1004",
+   "self_type" : "type-1003",
+   "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-1029",
+   "self_type" : "type-1028",
+   "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-1117",
+   "self_type" : "type-1116",
+   "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-1218",
+   "self_type" : "type-1217",
+   "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-1566",
+   "self_type" : "type-1565",
+   "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-262",
+   "self_type" : "type-261",
+   "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-468",
+   "self_type" : "type-467",
+   "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-665",
+   "self_type" : "type-664",
+   "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-848",
+   "self_type" : "type-847",
+   "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-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "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-1001",
+   "self_type" : "type-1000",
+   "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-1092",
+   "self_type" : "type-1091",
+   "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-1201",
+   "self_type" : "type-1200",
+   "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-1358",
+   "self_type" : "type-1357",
+   "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-1513",
    "self_type" : "type-1512",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.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-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1090",
-   "self_type" : "type-1089",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-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"
-  },
-  {
-   "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-671",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1181",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-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"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-998",
-   "self_type" : "type-997",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1169",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1202",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1521",
-   "self_type" : "type-1520",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-985",
-   "self_type" : "type-984",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1061",
-   "self_type" : "type-1060",
-   "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-1154",
-   "self_type" : "type-1153",
-   "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-1495",
-   "self_type" : "type-1494",
-   "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-259",
-   "self_type" : "type-258",
-   "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-453",
-   "self_type" : "type-452",
-   "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-640",
-   "self_type" : "type-639",
-   "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-796",
-   "self_type" : "type-795",
-   "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-874",
-   "self_type" : "type-873",
-   "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-970",
-   "self_type" : "type-969",
-   "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-995",
-   "self_type" : "type-994",
-   "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-1059",
-   "self_type" : "type-1058",
-   "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-1152",
-   "self_type" : "type-1151",
-   "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-1493",
-   "self_type" : "type-1492",
-   "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-257",
-   "self_type" : "type-256",
-   "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-450",
-   "self_type" : "type-449",
-   "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-638",
-   "self_type" : "type-637",
-   "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-794",
-   "self_type" : "type-793",
-   "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-871",
-   "self_type" : "type-870",
-   "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-963",
-   "self_type" : "type-962",
-   "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-968",
-   "self_type" : "type-967",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+   "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-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16000,8 +16701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16010,8 +16711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16020,8 +16721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16030,8 +16731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16040,8 +16741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16050,58 +16751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
-   "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-588",
-   "self_type" : "type-587",
-   "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-769",
-   "self_type" : "type-768",
-   "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-846",
-   "self_type" : "type-845",
-   "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-852",
-   "self_type" : "type-851",
-   "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-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16111,7 +16762,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-90",
-   "self_type" : "type-1043",
+   "self_type" : "type-1084",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16121,7 +16772,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-51",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16131,7 +16782,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-83",
-   "self_type" : "type-865",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16140,8 +16791,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-856",
+   "referenced_type" : "type-396",
+   "self_type" : "type-892",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16149,8 +16800,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-29",
+   "self_type" : "type-1097",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16158,8 +16809,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-39",
+   "self_type" : "type-300",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -16168,8 +16819,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-58",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -16183,14 +16834,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16202,17 +16853,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-51"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-44", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16222,37 +16873,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
+     "referenced_type" : "type-652"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
+   "name" : "android::LightRefBase<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-653" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
      "referenced_type" : "type-642"
     }
    ],
-   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
-   "name" : "android::LightRefBase<android::NativeHandle>",
+   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
+   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
    "referenced_type" : "type-641",
    "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "template_args" : [ "type-643" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-633" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16262,14 +16913,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-34"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16281,14 +16932,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1398"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1323",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16298,7 +16949,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-651"
     }
    ],
    "fields" :
@@ -16307,20 +16958,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16332,14 +16983,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16351,14 +17002,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1406"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16370,14 +17021,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1406"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16448,8 +17099,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
+   "referenced_type" : "type-915",
+   "self_type" : "type-915",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16459,8 +17110,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16492,8 +17143,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16504,17 +17155,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-52"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16561,14 +17212,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16626,14 +17277,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-45"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -16645,14 +17296,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -16672,62 +17323,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-297"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -16817,17 +17468,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -16874,7 +17525,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
@@ -16886,20 +17537,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -16951,14 +17602,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-641"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-643",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -16986,7 +17637,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -16995,32 +17646,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -17136,7 +17787,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     },
     {
      "access" : "private",
@@ -17148,14 +17799,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -17243,23 +17894,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17432,23 +18083,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17633,23 +18284,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17826,23 +18477,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18119,23 +18770,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18312,23 +18963,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -18501,23 +19152,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18694,23 +19345,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -19027,23 +19678,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -19216,23 +19867,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -19421,23 +20072,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -19618,23 +20269,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -19871,6 +20522,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -19979,23 +20634,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-635",
+   "self_type" : "type-635",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -20068,6 +20723,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -20179,17 +20838,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -20359,23 +21018,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1222"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1223"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1221",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-1209" ],
+   "template_args" : [ "type-3", "type-1224" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -20385,23 +21044,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1237"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1222"
+     "referenced_type" : "type-1238"
     }
    ],
    "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-1220",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1236",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-39" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -20411,23 +21070,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-1248"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1231"
+     "referenced_type" : "type-1249"
     }
    ],
    "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-1229",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1247",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1232", "type-1047" ],
+   "template_args" : [ "type-1250", "type-1088" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -20437,23 +21096,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1307"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1308"
     }
    ],
    "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-1279",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1306",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1282", "type-1283" ],
+   "template_args" : [ "type-1309", "type-1310" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -20463,23 +21122,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1266"
+     "referenced_type" : "type-1290"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1267"
+     "referenced_type" : "type-1291"
     }
    ],
    "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-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1289",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1268", "type-1269" ],
+   "template_args" : [ "type-1292", "type-1293" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -20508,8 +21167,8 @@
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -20520,7 +21179,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-920"
+     "referenced_type" : "type-929"
     },
     {
      "is_virtual" : true,
@@ -20530,8 +21189,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
+   "referenced_type" : "type-950",
+   "self_type" : "type-950",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -20618,8 +21277,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -20823,8 +21482,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -20906,13 +21565,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-971"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1103"
     },
     {
      "access" : "private",
@@ -20929,11 +21588,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -20949,19 +21608,19 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1193"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
@@ -20985,7 +21644,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1194"
     },
     {
      "access" : "private",
@@ -21015,38 +21674,38 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 448,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 456,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 464,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-1195"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -21073,8 +21732,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -21094,25 +21753,25 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
@@ -21130,86 +21789,86 @@
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-35"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 512,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-40"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-54"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 800,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 808,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -21287,7 +21946,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -21297,8 +21956,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -21308,7 +21967,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21317,17 +21976,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1424"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1351" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -21335,7 +21994,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21344,17 +22003,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-460" ],
+   "template_args" : [ "type-459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -21362,7 +22021,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21371,17 +22030,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1526"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1453" ],
+   "template_args" : [ "type-1526" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -21389,7 +22048,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21398,17 +22057,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-186" ],
+   "template_args" : [ "type-191" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -21416,7 +22075,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21425,17 +22084,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-407" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -21443,7 +22102,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21452,17 +22111,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-591" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -21470,7 +22129,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21479,17 +22138,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21497,17 +22156,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21517,26 +22176,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -21546,34 +22205,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1319",
+   "self_type" : "type-1319",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1221" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1351",
+   "self_type" : "type-1351",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1236" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1359",
+   "self_type" : "type-1359",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1247" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -21602,18 +22321,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1224",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -21625,14 +22344,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -21641,8 +22360,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -21651,8 +22370,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -21661,8 +22380,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -21682,8 +22401,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-86",
    "self_type" : "type-86",
@@ -21698,7 +22417,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
@@ -21706,11 +22425,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -21722,7 +22441,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-974"
     },
     {
      "field_name" : "_pad",
@@ -21730,11 +22449,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -21746,7 +22465,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -21754,11 +22473,35 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-485"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-83"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -21770,7 +22513,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
@@ -21778,11 +22521,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -21802,8 +22545,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-77",
    "self_type" : "type-77",
@@ -21818,7 +22561,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "_pad",
@@ -21826,11 +22569,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -21842,7 +22585,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     },
     {
      "field_name" : "_pad",
@@ -21850,11 +22593,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -21874,8 +22617,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-94",
    "self_type" : "type-94",
@@ -21889,16 +22632,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-950"
+     "referenced_type" : "type-973"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-975" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -21907,16 +22650,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -21925,16 +22668,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -21943,16 +22686,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -21961,16 +22704,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -22033,13 +22776,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-74" ],
@@ -22051,16 +22794,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-1008"
     }
    ],
    "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-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-1010" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22069,13 +22830,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-996"
     }
    ],
    "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-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-995",
+   "self_type" : "type-995",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-80" ],
@@ -22087,16 +22848,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -22105,16 +22866,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1058"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22124,7 +22885,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-609"
+     "referenced_type" : "type-615"
     },
     {
      "field_name" : "_pad",
@@ -22132,11 +22893,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22156,7 +22917,7 @@
    "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22166,7 +22927,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
      "field_name" : "_pad",
@@ -22174,8 +22935,8 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-82",
    "self_type" : "type-82",
@@ -22189,16 +22950,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22208,7 +22969,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "_pad",
@@ -22216,11 +22977,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22232,7 +22993,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-975"
+     "referenced_type" : "type-1009"
     },
     {
      "field_name" : "_pad",
@@ -22240,11 +23001,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-974",
-   "self_type" : "type-974",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -22256,7 +23017,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-997"
     },
     {
      "field_name" : "_pad",
@@ -22264,11 +23025,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-996",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22280,7 +23041,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
@@ -22288,11 +23049,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -22303,16 +23064,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1003"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22322,7 +23083,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1004"
+     "referenced_type" : "type-1024"
     },
     {
      "field_name" : "_pad",
@@ -22330,11 +23091,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22345,16 +23106,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22364,7 +23125,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "field_name" : "_pad",
@@ -22372,11 +23133,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22387,13 +23148,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-90" ],
@@ -22406,7 +23167,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "_pad",
@@ -22414,11 +23175,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -22427,8 +23188,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -22440,20 +23201,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22462,8 +23223,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -22473,8 +23234,8 @@
    "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-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -22485,7 +23246,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22494,13 +23255,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1476",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -22622,7 +23383,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22631,13 +23392,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -22759,7 +23520,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22768,13 +23529,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -22896,7 +23657,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22905,13 +23666,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -23033,7 +23794,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23042,13 +23803,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -23170,10 +23931,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1149"
+     "referenced_type" : "type-1188"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23182,19 +23943,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1479"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1407"
+     "referenced_type" : "type-1480"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -23383,10 +24144,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1187"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23395,19 +24156,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1472"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1471",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -23605,10 +24366,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23617,19 +24378,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -23821,10 +24582,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23833,19 +24594,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -24112,10 +24873,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24124,19 +24885,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-341"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -24329,23 +25090,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-164"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-160"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -24360,8 +25121,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -24483,8 +25244,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -24618,8 +25379,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -24745,8 +25506,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -24972,8 +25733,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -25095,18 +25856,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -25127,8 +25888,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -25149,8 +25910,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -25161,13 +25922,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -25193,8 +25954,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -25215,8 +25976,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -25226,7 +25987,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25235,13 +25996,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -25363,7 +26124,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25372,13 +26133,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -25500,7 +26261,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25509,13 +26270,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -25637,10 +26398,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -25649,19 +26410,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1413"
+     "referenced_type" : "type-1487"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1414"
+     "referenced_type" : "type-1488"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1486",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -25850,10 +26611,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -25862,19 +26623,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -26066,10 +26827,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26078,19 +26839,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -26415,7 +27176,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -26479,7 +27240,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -26505,13 +27266,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -26628,13 +27389,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -26755,13 +27516,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -27023,13 +27784,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -27039,7 +27800,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27048,13 +27809,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1313",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -27176,7 +27937,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27185,13 +27946,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1526"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1529",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -27313,7 +28074,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27322,13 +28083,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -27450,7 +28211,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27459,13 +28220,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -27587,7 +28348,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27596,13 +28357,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -27724,10 +28485,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1191"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27736,19 +28497,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1420"
+     "referenced_type" : "type-1494"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1495"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1493",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -27937,10 +28698,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27949,19 +28710,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -28162,10 +28923,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28174,19 +28935,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-208"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -28381,10 +29142,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28393,19 +29154,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-422"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -28599,6 +29360,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -28723,10 +29487,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28735,19 +29499,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-603"
+     "referenced_type" : "type-633"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -28818,6 +29582,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -28942,10 +29709,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28954,19 +29721,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -29097,10 +29864,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29109,19 +29876,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -29264,10 +30031,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29276,19 +30043,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -29425,10 +30192,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29437,19 +30204,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -29643,6 +30410,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -29709,10 +30479,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29721,19 +30491,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -29804,6 +30574,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -29870,13 +30643,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -29993,13 +30766,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -30132,13 +30905,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -30263,13 +31036,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -30508,6 +31281,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -30558,13 +31335,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -30639,6 +31416,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -30685,19 +31466,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-103"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-122"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1045"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30710,13 +31513,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-1011"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1010",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30736,7 +31539,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
@@ -30753,8 +31556,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 40,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -30839,8 +31642,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -30922,19 +31725,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30946,7 +31749,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "access" : "private",
@@ -30963,8 +31766,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -30988,7 +31791,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -31006,7 +31809,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-972"
     },
     {
      "access" : "private",
@@ -31018,16 +31821,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-975" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -31037,7 +31840,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-483"
     },
     {
      "access" : "private",
@@ -31049,16 +31852,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -31068,7 +31871,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -31080,16 +31883,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -31099,7 +31902,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-491"
     },
     {
      "access" : "private",
@@ -31111,16 +31914,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -31130,7 +31933,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
@@ -31142,16 +31945,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -31173,7 +31976,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -31204,7 +32007,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -31235,7 +32038,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -31254,7 +32057,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -31266,13 +32069,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-74" ],
@@ -31285,7 +32088,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -31297,16 +32100,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-1007"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-39"
     }
    ],
    "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-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1006",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-1010" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -31316,7 +32150,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-995"
     },
     {
      "access" : "private",
@@ -31328,13 +32162,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-80" ],
@@ -31347,7 +32181,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -31359,16 +32193,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -31378,7 +32212,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1057"
     },
     {
      "access" : "private",
@@ -31390,16 +32224,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -31409,7 +32243,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1002"
+     "referenced_type" : "type-1022"
     },
     {
      "access" : "private",
@@ -31421,16 +32255,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -31440,7 +32274,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -31452,13 +32286,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -31471,19 +32305,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -31493,10 +32327,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -31505,13 +32339,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -31633,10 +32467,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1142"
+     "referenced_type" : "type-1186"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -31645,19 +32479,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1464"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1465"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1463",
    "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",
@@ -31841,7 +32675,7 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
@@ -31851,13 +32685,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1091",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "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"
@@ -31988,8 +32822,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "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",
@@ -32141,23 +32975,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-1001"
+     "referenced_type" : "type-1021"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1416",
    "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"
@@ -32172,8 +33006,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "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",
@@ -32288,17 +33122,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-295"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-296" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -32308,17 +33142,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32348,17 +33182,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -32368,17 +33202,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -32388,17 +33222,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-40" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -32408,17 +33242,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -32428,17 +33262,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -32448,17 +33282,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -32468,17 +33302,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -32488,17 +33322,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -32508,17 +33342,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-443"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-442",
+   "self_type" : "type-442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -32528,17 +33362,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -32548,17 +33382,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -32568,17 +33402,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -32588,17 +33422,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -32608,17 +33442,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -32628,17 +33462,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -32648,17 +33482,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -32668,17 +33502,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-491"
+     "referenced_type" : "type-497"
     }
    ],
    "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-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -32688,17 +33522,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32714,8 +33548,8 @@
    "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-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -32728,17 +33562,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-269"
     }
    ],
    "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-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-267" ],
+   "template_args" : [ "type-270" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -32748,47 +33582,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-336"
     }
    ],
    "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-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-354" ],
+   "template_args" : [ "type-337" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -32798,63 +33632,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -32864,8 +33698,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -32875,8 +33709,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -32886,63 +33720,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -32952,63 +33786,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33018,8 +33852,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33029,8 +33863,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33040,33 +33874,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -33077,26 +33911,26 @@
    "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -33106,63 +33940,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-708",
+   "self_type" : "type-708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33172,8 +34006,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33183,8 +34017,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33194,85 +34028,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "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-1139",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-44" ],
    "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-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-54" ],
    "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-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -33282,63 +34116,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33348,8 +34182,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33359,8 +34193,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33370,33 +34204,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -33406,7 +34240,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     },
     {
      "access" : "private",
@@ -33418,11 +34252,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -33444,8 +34278,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -33458,7 +34292,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
@@ -33470,11 +34304,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -33509,18 +34343,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -33536,18 +34370,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1380"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1388"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -33558,7 +34392,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1384"
     },
     {
      "field_name" : "num_planes",
@@ -33568,13 +34402,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1386"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -33585,48 +34419,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1381"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -33637,38 +34471,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1316",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1390",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -33679,18 +34513,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -33701,17 +34535,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
@@ -33731,13 +34565,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1380"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -33747,13 +34581,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -33764,35 +34598,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-394"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v3",
      "referenced_type" : "type-395"
     },
     {
+     "field_name" : "entry_v4",
+     "referenced_type" : "type-395"
+    },
+    {
+     "field_name" : "entry_v3",
+     "referenced_type" : "type-398"
+    },
+    {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-400"
     }
    ],
    "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-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "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)"
@@ -33813,8 +34647,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1128",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -33825,43 +34659,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -33872,32 +34706,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -33907,13 +34741,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -33924,32 +34758,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -33959,13 +34793,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -33976,17 +34810,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -34016,13 +34850,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -34033,28 +34867,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-166"
+     "referenced_type" : "type-171"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -34066,8 +34900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34075,8 +34909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-584",
-   "self_type" : "type-586",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34084,8 +34918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34093,8 +34927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-241",
-   "self_type" : "type-246",
+   "referenced_type" : "type-246",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34102,8 +34936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-430",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34111,8 +34945,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-617",
-   "self_type" : "type-619",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34120,8 +34954,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-561",
-   "self_type" : "type-579",
+   "referenced_type" : "type-552",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34129,8 +34963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-620",
-   "self_type" : "type-626",
+   "referenced_type" : "type-629",
+   "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34138,8 +34972,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-540",
+   "referenced_type" : "type-248",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34147,8 +34981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-608",
+   "referenced_type" : "type-247",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34156,8 +34990,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-160",
-   "self_type" : "type-934",
+   "referenced_type" : "type-165",
+   "self_type" : "type-933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -34165,8 +34999,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-920",
-   "self_type" : "type-941",
+   "referenced_type" : "type-929",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -34174,8 +35008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-375",
-   "self_type" : "type-387",
+   "referenced_type" : "type-372",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34183,8 +35017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-208",
-   "self_type" : "type-221",
+   "referenced_type" : "type-213",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34192,8 +35026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-212",
-   "self_type" : "type-415",
+   "referenced_type" : "type-217",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34201,8 +35035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-460",
-   "self_type" : "type-473",
+   "referenced_type" : "type-459",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34210,8 +35044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34219,8 +35053,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-186",
-   "self_type" : "type-238",
+   "referenced_type" : "type-191",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34228,8 +35062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-407",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34237,8 +35071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-591",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34246,8 +35080,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-496",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34255,8 +35089,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-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34264,8 +35098,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-1173",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34273,8 +35107,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-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34282,8 +35116,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-1525",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34291,8 +35125,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-280",
-   "self_type" : "type-279",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34300,8 +35134,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-512",
-   "self_type" : "type-511",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34309,8 +35143,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34318,8 +35152,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-812",
-   "self_type" : "type-811",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34327,8 +35161,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-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34336,8 +35170,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-989",
-   "self_type" : "type-988",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34345,8 +35179,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34354,8 +35188,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34363,8 +35197,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34372,8 +35206,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34381,8 +35215,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34390,8 +35224,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34399,8 +35233,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34408,8 +35242,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
+   "referenced_type" : "type-697",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34417,8 +35251,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34426,8 +35260,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34435,8 +35269,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34444,8 +35278,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34453,8 +35287,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34462,8 +35296,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34471,8 +35305,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34480,8 +35314,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34489,8 +35323,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34498,8 +35332,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34507,8 +35341,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34516,8 +35350,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-945",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }

diff --git a/Q/64/arm_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump b/Q/64/arm_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump
index 2c5bb82..11980d9 100644
--- a/Q/64/arm_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-394",
+   "referenced_type" : "type-57",
+   "self_type" : "type-397",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-57",
+   "self_type" : "type-1320",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-807",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1388",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-41",
-   "self_type" : "type-166",
+   "referenced_type" : "type-27",
+   "self_type" : "type-171",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1045",
+   "self_type" : "type-1086",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-90",
-   "self_type" : "type-977",
+   "self_type" : "type-1011",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-391",
+   "self_type" : "type-394",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1307",
+   "self_type" : "type-1380",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1
   },
   {
@@ -79,8 +88,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1
   },
   {
@@ -89,8 +98,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -105,8 +114,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 4
   },
   {
@@ -114,8 +123,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -123,16 +132,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 2
   },
   {
@@ -158,8 +167,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-864",
+   "self_type" : "type-864",
    "size" : 1
   },
   {
@@ -188,8 +197,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4
   },
   {
@@ -208,15 +217,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -360,6 +369,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -483,6 +495,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -534,6 +549,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -1002,6 +1020,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1041,6 +1062,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1056,6 +1080,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1074,6 +1101,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1637,8 +1670,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1327",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1655,8 +1688,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1673,8 +1706,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1699,11 +1732,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1729,11 +1762,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1751,8 +1784,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1777,11 +1810,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1831,11 +1864,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1885,8 +1918,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1907,8 +1940,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1941,8 +1974,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1971,8 +2004,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2005,8 +2038,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2031,8 +2064,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2061,8 +2094,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2127,8 +2160,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2271,8 +2304,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2330,6 +2363,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2451,11 +2522,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1112",
    "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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2469,11 +2540,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2495,8 +2566,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "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-90",
@@ -2599,8 +2670,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2625,8 +2696,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2667,8 +2738,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2909,8 +2980,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-1292",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2939,8 +3010,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1372",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2969,8 +3040,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3011,8 +3082,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3049,8 +3120,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3075,8 +3146,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3093,8 +3164,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3123,8 +3194,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3217,8 +3288,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3259,8 +3330,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3277,8 +3348,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3307,8 +3378,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3341,8 +3412,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3395,8 +3466,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3412,18 +3483,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
-    },
-    {
-     "referenced_type" : "type-62"
-    },
-    {
      "referenced_type" : "type-42"
+    },
+    {
+     "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-41",
+   "return_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3433,12 +3504,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1319",
-   "return_type" : "type-41",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1392",
+   "return_type" : "type-27",
+   "self_type" : "type-1392",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3448,27 +3519,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1083"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1198"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1162",
-   "return_type" : "type-43",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1196",
+   "return_type" : "type-29",
+   "self_type" : "type-1196",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3481,14 +3552,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3498,16 +3569,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3517,13 +3588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1532"
+     "referenced_type" : "type-1605"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3533,13 +3604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1533"
+     "referenced_type" : "type-1606"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3549,14 +3620,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3566,13 +3637,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3582,13 +3653,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1534"
+     "referenced_type" : "type-1607"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3598,14 +3669,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3615,13 +3686,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1535"
+     "referenced_type" : "type-1608"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3631,10 +3702,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3644,10 +3715,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3656,13 +3727,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3672,10 +3743,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3685,16 +3756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3703,14 +3774,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3719,14 +3790,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3735,14 +3806,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3751,14 +3822,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3769,13 +3840,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-1540"
+     "referenced_type" : "type-1613"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3785,13 +3856,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3801,13 +3872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3817,14 +3888,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3834,16 +3905,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3853,13 +3924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1568"
+     "referenced_type" : "type-1641"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3869,13 +3940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1569"
+     "referenced_type" : "type-1642"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3885,14 +3956,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3902,13 +3973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3918,13 +3989,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-1643"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3934,14 +4005,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3951,13 +4022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-1644"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3967,10 +4038,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3980,10 +4051,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3992,13 +4063,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4008,10 +4079,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4021,16 +4092,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4039,14 +4110,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-234"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4055,14 +4126,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-240"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4071,14 +4142,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4087,14 +4158,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4105,13 +4176,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-1575"
+     "referenced_type" : "type-1648"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4121,13 +4192,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4137,13 +4208,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4153,16 +4224,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -4170,10 +4241,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1578"
+     "referenced_type" : "type-1651"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4184,13 +4255,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-1652"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4199,19 +4270,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1580"
+     "referenced_type" : "type-1653"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4220,19 +4291,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1581"
+     "referenced_type" : "type-1654"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1207"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-1655"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4241,19 +4333,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1582"
+     "referenced_type" : "type-1656"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4262,19 +4354,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1583"
+     "referenced_type" : "type-1657"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4283,19 +4375,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1584"
+     "referenced_type" : "type-1658"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4304,19 +4396,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1659"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4325,19 +4417,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1660"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4348,10 +4440,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4361,13 +4453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4377,13 +4469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4393,10 +4485,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4406,10 +4498,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4419,10 +4511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4432,13 +4524,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-1661"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4448,13 +4540,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4464,16 +4556,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4483,13 +4575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1662"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4499,16 +4591,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4518,13 +4610,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4534,13 +4626,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4550,13 +4642,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1663"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4566,13 +4658,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1590"
+     "referenced_type" : "type-1664"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4582,13 +4674,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1665"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4598,28 +4690,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1666"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4629,16 +4721,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1667"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4648,13 +4740,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4664,13 +4756,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1668"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4680,13 +4772,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1669"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4696,16 +4788,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1670"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4715,19 +4807,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4737,16 +4829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1597"
+     "referenced_type" : "type-1671"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4756,16 +4848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4775,13 +4867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1598"
+     "referenced_type" : "type-1672"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4791,16 +4883,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1599"
+     "referenced_type" : "type-1673"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4810,13 +4902,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4826,13 +4918,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1600"
+     "referenced_type" : "type-1674"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4842,28 +4934,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1675"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4873,28 +4965,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-1676"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4904,16 +4996,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1603"
+     "referenced_type" : "type-1677"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4923,13 +5015,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4939,16 +5031,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4958,19 +5050,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1678"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4980,13 +5072,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-598"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-425"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4996,16 +5110,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5015,13 +5129,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1679"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5031,19 +5145,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1606"
+     "referenced_type" : "type-1680"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5053,13 +5167,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1681"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5069,16 +5183,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1682"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5088,10 +5202,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5101,13 +5215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5117,16 +5231,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5136,13 +5250,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5152,16 +5266,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5171,10 +5285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5184,10 +5298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5197,10 +5311,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5210,16 +5324,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-1683"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5228,16 +5342,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1684"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5246,31 +5360,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-1685"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5280,19 +5394,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1686"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1539"
+    },
+    {
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5302,16 +5440,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1687"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5320,16 +5458,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5338,16 +5476,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5357,13 +5495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1614"
+     "referenced_type" : "type-1688"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5372,19 +5510,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1615"
+     "referenced_type" : "type-1689"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5393,22 +5531,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-1690"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5417,16 +5555,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1691"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5436,10 +5574,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5449,22 +5587,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1692"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5474,16 +5612,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5493,25 +5631,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1693"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5521,25 +5659,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1694"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5549,25 +5687,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1695"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5577,25 +5715,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1622"
+     "referenced_type" : "type-1696"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5605,19 +5743,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1426"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5627,13 +5765,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5643,13 +5781,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5659,14 +5797,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5676,16 +5814,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5695,13 +5833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1623"
+     "referenced_type" : "type-1697"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5711,13 +5849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1698"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5727,14 +5865,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5744,13 +5882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5760,13 +5898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1699"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5776,14 +5914,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5793,13 +5931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1626"
+     "referenced_type" : "type-1700"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5809,10 +5947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5822,10 +5960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5834,13 +5972,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5850,10 +5988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5863,16 +6001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5881,14 +6019,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1517"
+     "referenced_type" : "type-1588"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5897,14 +6035,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5913,14 +6051,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5930,16 +6068,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -5947,10 +6085,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1627"
+     "referenced_type" : "type-1701"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5961,13 +6099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-1628"
+     "referenced_type" : "type-1702"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5976,19 +6114,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1703"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5999,10 +6137,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6012,13 +6150,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6028,13 +6166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6044,10 +6182,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6057,10 +6195,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6070,10 +6208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6083,16 +6221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6102,19 +6240,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-1704"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6124,13 +6262,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1705"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6140,13 +6278,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1706"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6156,13 +6294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6172,13 +6310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1707"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6188,13 +6326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1708"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6204,10 +6342,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6217,10 +6355,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6230,13 +6368,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6246,13 +6384,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6262,19 +6400,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6283,22 +6421,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6308,10 +6446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6321,16 +6459,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6340,13 +6478,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6356,13 +6494,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6373,13 +6511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1712"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6389,13 +6527,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6405,13 +6543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1533"
     },
     {
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6421,14 +6559,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6438,16 +6576,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6457,13 +6595,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1716"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6473,13 +6611,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-1717"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6489,14 +6627,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6506,13 +6644,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6522,13 +6660,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-1718"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6538,14 +6676,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6555,13 +6693,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1719"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6571,10 +6709,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6584,10 +6722,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6596,13 +6734,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6612,10 +6750,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6625,16 +6763,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6647,10 +6785,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6659,14 +6797,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6675,14 +6813,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6691,14 +6829,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6709,13 +6847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1723"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6725,13 +6863,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6741,13 +6879,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1546"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6757,16 +6895,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -6774,10 +6912,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1726"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6788,13 +6926,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1727"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6803,19 +6941,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-1728"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6826,10 +6964,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6839,13 +6977,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6855,13 +6993,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     },
     {
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1528"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6871,10 +7009,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6884,10 +7022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6897,10 +7035,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1530"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6910,40 +7048,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1655"
+     "referenced_type" : "type-1729"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6953,16 +7091,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6972,13 +7110,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1656"
+     "referenced_type" : "type-1730"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6988,13 +7126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1731"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7004,13 +7142,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7020,13 +7158,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-1732"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7036,7 +7174,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
      "referenced_type" : "type-2"
@@ -7045,7 +7183,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7054,43 +7192,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-1733"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7100,13 +7238,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1547",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7116,13 +7254,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1734"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7132,16 +7270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-939"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7151,10 +7289,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7164,10 +7302,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7177,13 +7315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-917"
+     "referenced_type" : "type-928"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7193,10 +7331,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7206,16 +7344,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-1535"
+    },
+    {
+     "referenced_type" : "type-1100"
+    },
+    {
      "referenced_type" : "type-1461"
-    },
-    {
-     "referenced_type" : "type-1068"
-    },
-    {
-     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7225,40 +7363,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1429"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-1592"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-1735"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7268,13 +7406,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7284,13 +7422,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1535"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7300,16 +7438,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -7317,10 +7455,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1662"
+     "referenced_type" : "type-1736"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7331,13 +7469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1737"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7348,10 +7486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7361,13 +7499,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7377,13 +7515,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1517"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7393,10 +7531,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7406,10 +7544,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7419,10 +7557,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7432,16 +7570,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7451,19 +7589,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1664"
+     "referenced_type" : "type-1738"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7473,13 +7611,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1665"
+     "referenced_type" : "type-1739"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7489,13 +7627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1666"
+     "referenced_type" : "type-1740"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7505,13 +7643,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7521,13 +7659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1667"
+     "referenced_type" : "type-1741"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7537,13 +7675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1742"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7553,10 +7691,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7566,10 +7704,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7579,13 +7717,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1498"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7595,10 +7733,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7608,16 +7746,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7627,13 +7765,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7643,13 +7781,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-1578"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7659,14 +7797,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7676,16 +7814,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7695,13 +7833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1669"
+     "referenced_type" : "type-1743"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7711,13 +7849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1670"
+     "referenced_type" : "type-1744"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7727,14 +7865,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7744,13 +7882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7760,13 +7898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-1745"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7776,14 +7914,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7793,13 +7931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1672"
+     "referenced_type" : "type-1746"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7809,10 +7947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7822,10 +7960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7834,13 +7972,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7850,10 +7988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7863,16 +8001,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7881,14 +8019,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7897,14 +8035,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1536"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7913,14 +8051,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7931,13 +8069,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-1675"
+     "referenced_type" : "type-1749"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7947,13 +8085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7963,13 +8101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7979,16 +8117,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
@@ -7996,10 +8134,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1752"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8010,13 +8148,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1753"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1207"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-1754"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8025,19 +8184,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1206"
     },
     {
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1197"
     },
     {
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1755"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8048,10 +8207,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8061,13 +8220,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8077,13 +8236,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8093,10 +8252,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8106,10 +8265,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8119,10 +8278,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8132,16 +8291,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8151,13 +8310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1756"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8167,13 +8326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1757"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8183,13 +8342,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1055"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8199,13 +8358,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1758"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8215,19 +8374,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8237,13 +8418,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1759"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8253,16 +8434,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8272,13 +8453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8288,10 +8469,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8301,10 +8482,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1539"
+    },
+    {
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-1050"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8313,16 +8518,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     },
     {
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8332,10 +8537,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8345,16 +8550,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8364,19 +8569,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1426"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8386,13 +8591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8402,33 +8607,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-1197"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-1206"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-210", "type-404" ]
+   "template_args" : [ "type-409", "type-215", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8436,18 +8683,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-404" ]
+   "template_args" : [ "type-409", "type-410", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8455,18 +8702,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-404" ]
+   "template_args" : [ "type-409", "type-5", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8474,18 +8721,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-190", "type-202" ]
+   "template_args" : [ "type-193", "type-195", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8493,18 +8740,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-189", "type-202" ]
+   "template_args" : [ "type-193", "type-194", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8512,18 +8759,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-5", "type-202" ]
+   "template_args" : [ "type-193", "type-5", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8531,18 +8778,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-133", "type-138" ]
+   "template_args" : [ "type-139", "type-140", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8550,18 +8797,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1478",
+   "return_type" : "type-1553",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-5", "type-138" ]
+   "template_args" : [ "type-139", "type-5", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8569,18 +8816,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-413", "type-1419" ]
+   "template_args" : [ "type-461", "type-417", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8588,18 +8835,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-439", "type-1419" ]
+   "template_args" : [ "type-461", "type-444", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8607,18 +8854,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-5", "type-1419" ]
+   "template_args" : [ "type-461", "type-5", "type-1493" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8626,18 +8873,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-214", "type-602" ]
+   "template_args" : [ "type-623", "type-219", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8645,18 +8892,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-5", "type-602" ]
+   "template_args" : [ "type-623", "type-5", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8664,12 +8911,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
-   "return_type" : "type-208",
+   "return_type" : "type-213",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-210", "type-43" ]
+   "template_args" : [ "type-215", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8677,12 +8924,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-375",
+   "return_type" : "type-372",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-133", "type-43" ]
+   "template_args" : [ "type-140", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8690,12 +8937,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
-   "return_type" : "type-212",
+   "return_type" : "type-217",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-214", "type-43" ]
+   "template_args" : [ "type-219", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8703,18 +8950,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-404", "type-384", "type-43", "type-43" ]
+   "template_args" : [ "type-421", "type-409", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8722,18 +8969,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-188", "type-43", "type-43" ]
+   "template_args" : [ "type-207", "type-193", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8741,18 +8988,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-1596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1453",
+   "return_type" : "type-1526",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-138", "type-132", "type-43", "type-43" ]
+   "template_args" : [ "type-143", "type-139", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8760,18 +9007,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1204"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1419", "type-462", "type-43", "type-43" ]
+   "template_args" : [ "type-1493", "type-461", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8779,18 +9026,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-602", "type-593", "type-43", "type-43" ]
+   "template_args" : [ "type-632", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8798,31 +9045,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8832,8 +9079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8841,8 +9088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8850,8 +9097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1151",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8859,8 +9106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8868,8 +9115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1550",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8877,8 +9124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-584",
-   "self_type" : "type-589",
+   "referenced_type" : "type-603",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8886,8 +9133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8895,8 +9142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-241",
-   "self_type" : "type-247",
+   "referenced_type" : "type-246",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8904,8 +9151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8913,8 +9160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-617",
-   "self_type" : "type-621",
+   "referenced_type" : "type-648",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8922,8 +9169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-561",
-   "self_type" : "type-580",
+   "referenced_type" : "type-552",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8931,8 +9178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-627",
+   "referenced_type" : "type-629",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8940,8 +9187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-243",
-   "self_type" : "type-550",
+   "referenced_type" : "type-248",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8949,8 +9196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8958,8 +9205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8967,8 +9214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8976,8 +9223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8985,8 +9232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8994,8 +9241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9003,8 +9250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9012,8 +9259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9021,8 +9268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9030,8 +9277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9039,8 +9286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9048,8 +9295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-936",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9057,8 +9304,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-697",
+   "referenced_type" : "type-483",
+   "self_type" : "type-751",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9066,8 +9322,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-973",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9075,8 +9331,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-954",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9084,8 +9340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-683",
+   "referenced_type" : "type-104",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9093,8 +9349,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-701",
+   "referenced_type" : "type-486",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-123",
+   "self_type" : "type-614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9102,8 +9367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-976",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9111,8 +9376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-937",
+   "referenced_type" : "type-929",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9121,7 +9386,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-80",
-   "self_type" : "type-1430",
+   "self_type" : "type-1503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9129,8 +9394,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-467",
-   "self_type" : "type-647",
+   "referenced_type" : "type-482",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9138,8 +9412,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-972",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9147,8 +9421,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-953",
-   "self_type" : "type-971",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9156,8 +9430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-645",
+   "referenced_type" : "type-103",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9165,8 +9439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-380",
+   "referenced_type" : "type-372",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9174,8 +9448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-220",
+   "referenced_type" : "type-213",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9183,8 +9457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-414",
+   "referenced_type" : "type-217",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9192,8 +9466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-460",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9201,8 +9475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9210,8 +9484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-239",
+   "referenced_type" : "type-191",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9219,8 +9493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-407",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9228,8 +9502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9237,8 +9511,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-490",
-   "self_type" : "type-501",
+   "referenced_type" : "type-496",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9246,8 +9520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9255,8 +9529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9264,8 +9538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1206",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9273,8 +9547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-609",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9282,8 +9556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-537",
+   "referenced_type" : "type-537",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9291,8 +9565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9300,8 +9574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-167",
+   "referenced_type" : "type-162",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9309,8 +9583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9318,8 +9592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-464",
-   "self_type" : "type-578",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9327,8 +9601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-151",
-   "self_type" : "type-153",
+   "referenced_type" : "type-156",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9336,8 +9610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9345,8 +9619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9354,8 +9628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9363,8 +9637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9372,17 +9646,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-574",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9390,8 +9673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9399,8 +9682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-934",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9408,8 +9691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-917",
+   "referenced_type" : "type-919",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9417,8 +9700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9426,8 +9709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-503",
+   "referenced_type" : "type-480",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9435,8 +9718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1592",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9444,8 +9727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9453,8 +9736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1583",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9462,17 +9745,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1387",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1461",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9480,8 +9772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-502",
+   "referenced_type" : "type-504",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9489,8 +9781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9498,8 +9790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9507,8 +9799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9516,8 +9808,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-1249",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1284",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9525,8 +9817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9534,7 +9826,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9543,8 +9835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-401",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-405",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9552,8 +9844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-228",
-   "self_type" : "type-229",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9561,8 +9853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-207",
-   "self_type" : "type-211",
+   "referenced_type" : "type-212",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9570,8 +9862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-217",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9579,8 +9871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-445",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9588,8 +9880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-234",
-   "self_type" : "type-235",
+   "referenced_type" : "type-239",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9597,8 +9889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9606,8 +9898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9615,8 +9907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9624,8 +9916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-191",
+   "referenced_type" : "type-190",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9633,8 +9925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-386",
+   "referenced_type" : "type-406",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9642,8 +9934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-590",
-   "self_type" : "type-594",
+   "referenced_type" : "type-620",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9651,8 +9943,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-507",
-   "self_type" : "type-858",
+   "referenced_type" : "type-515",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9660,8 +9952,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-980",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9669,8 +9961,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-1462",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9678,8 +9970,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-364",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-369",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9687,8 +9979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9696,8 +9988,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-1445",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9705,8 +9997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-296",
-   "self_type" : "type-847",
+   "referenced_type" : "type-297",
+   "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9714,8 +10006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-877",
+   "referenced_type" : "type-908",
+   "self_type" : "type-909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9723,8 +10015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-875",
+   "referenced_type" : "type-906",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9732,101 +10024,101 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1363",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1027",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1115",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1215",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1305",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1564",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
    "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-661",
+   "self_type" : "type-663",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-789",
-   "self_type" : "type-791",
+   "referenced_type" : "type-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-867",
-   "self_type" : "type-869",
+   "referenced_type" : "type-843",
+   "self_type" : "type-845",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-945",
-   "self_type" : "type-947",
+   "referenced_type" : "type-920",
+   "self_type" : "type-922",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-964",
-   "self_type" : "type-966",
+   "referenced_type" : "type-952",
+   "self_type" : "type-962",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-484",
+   "referenced_type" : "type-391",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9834,8 +10126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-861",
+   "referenced_type" : "type-899",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9843,8 +10135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-855",
+   "referenced_type" : "type-884",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9852,8 +10144,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-848",
-   "self_type" : "type-853",
+   "referenced_type" : "type-863",
+   "self_type" : "type-871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9861,8 +10153,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-1075",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9870,8 +10162,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-1169",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1134",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9879,8 +10171,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-1202",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9888,71 +10180,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-1520",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-282",
+   "self_type" : "type-284",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-525",
+   "self_type" : "type-527",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-687",
+   "self_type" : "type-689",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-860",
+   "self_type" : "type-862",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-937",
+   "self_type" : "type-940",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1000",
+   "self_type" : "type-999",
+   "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-1091",
+   "self_type" : "type-1090",
+   "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-1200",
+   "self_type" : "type-1199",
+   "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-1357",
+   "self_type" : "type-1356",
+   "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-1512",
+   "self_type" : "type-1511",
+   "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-1523",
    "self_type" : "type-1522",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-504",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-808",
-   "self_type" : "type-810",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-984",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+   "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-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-188",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9960,8 +10306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-402",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9969,8 +10315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9978,8 +10324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-822",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9987,8 +10333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9996,62 +10342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-182",
-   "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-378",
-   "self_type" : "type-377",
-   "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-587",
-   "self_type" : "type-705",
-   "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-768",
-   "self_type" : "type-767",
-   "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-845",
-   "self_type" : "type-844",
-   "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-851",
-   "self_type" : "type-850",
-   "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-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10059,8 +10351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10068,8 +10360,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-859",
+   "referenced_type" : "type-37",
+   "self_type" : "type-895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10077,8 +10369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-865",
-   "self_type" : "type-866",
+   "referenced_type" : "type-904",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10086,8 +10378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-856",
-   "self_type" : "type-857",
+   "referenced_type" : "type-892",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -10095,8 +10387,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1121",
    "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"
   },
@@ -10105,7 +10397,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1345",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -10114,7 +10406,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1358",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -10125,8 +10417,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -10134,8 +10426,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10143,8 +10435,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1323",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -10152,8 +10444,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10161,8 +10453,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10170,8 +10462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -10180,7 +10472,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-889",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10188,8 +10480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10197,8 +10489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10206,8 +10498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10215,8 +10507,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10224,8 +10516,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-250",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10233,8 +10525,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10242,8 +10534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10251,8 +10543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10260,8 +10552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10269,8 +10561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-839",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10287,8 +10579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10305,8 +10597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-878",
-   "self_type" : "type-881",
+   "referenced_type" : "type-910",
+   "self_type" : "type-911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10314,8 +10606,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10323,8 +10615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10332,8 +10624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10341,8 +10633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-296",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10350,8 +10642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-657",
+   "referenced_type" : "type-643",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10359,8 +10651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-510",
+   "referenced_type" : "type-200",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10368,8 +10660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10377,8 +10669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10386,8 +10678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-272",
+   "referenced_type" : "type-210",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10395,8 +10687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-498",
+   "referenced_type" : "type-424",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10404,17 +10696,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-651",
+   "referenced_type" : "type-635",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-1221",
+   "self_type" : "type-1335",
+   "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-1236",
+   "self_type" : "type-1354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-1229",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10422,8 +10732,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-1279",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10431,8 +10741,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-1265",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10440,8 +10750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10449,8 +10759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10467,8 +10777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10476,8 +10786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10485,8 +10795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10494,8 +10804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1548",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10503,8 +10813,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "type-603",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10512,8 +10822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10521,8 +10831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-245",
+   "referenced_type" : "type-246",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10530,8 +10840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10539,8 +10849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-618",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10548,8 +10858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-561",
-   "self_type" : "type-575",
+   "referenced_type" : "type-552",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10557,8 +10867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-624",
+   "referenced_type" : "type-629",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10566,17 +10876,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-523",
+   "referenced_type" : "type-248",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1319",
+   "self_type" : "type-1344",
+   "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-1351",
+   "self_type" : "type-1355",
+   "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-1359",
+   "self_type" : "type-1360",
+   "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-146",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-151",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10584,8 +10921,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-696",
+   "referenced_type" : "type-483",
+   "self_type" : "type-750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10593,8 +10939,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-973",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10602,8 +10948,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-954",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10611,8 +10957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-672",
+   "referenced_type" : "type-104",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10620,8 +10966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-606",
+   "referenced_type" : "type-247",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10629,8 +10975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1477",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10638,8 +10984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1470",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10647,8 +10993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-352",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10656,8 +11002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-338",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10665,8 +11011,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
+   "referenced_type" : "type-338",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10674,8 +11020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10683,8 +11029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-376",
+   "referenced_type" : "type-140",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10692,8 +11038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-226",
+   "referenced_type" : "type-195",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10701,8 +11047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-215",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10710,8 +11056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-219",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10719,8 +11065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10728,8 +11074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10737,8 +11083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10746,8 +11092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10755,8 +11101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10764,8 +11110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-355",
+   "referenced_type" : "type-359",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10773,8 +11119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-563",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10783,7 +11129,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-74",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10818,8 +11164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10827,8 +11173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-232",
+   "referenced_type" : "type-194",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10836,8 +11182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-418",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10845,8 +11191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10854,8 +11200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10863,8 +11209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-197",
+   "referenced_type" : "type-197",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10872,8 +11218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-399",
+   "referenced_type" : "type-414",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10881,8 +11227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10890,8 +11236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10899,8 +11245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-143",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10908,8 +11254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-206",
+   "referenced_type" : "type-207",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10917,8 +11263,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-404",
-   "self_type" : "type-409",
+   "referenced_type" : "type-421",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10926,8 +11272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "type-632",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10935,8 +11281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10944,8 +11290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1533",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10953,8 +11299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-201",
+   "referenced_type" : "type-203",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10962,8 +11308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10971,8 +11317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-601",
+   "referenced_type" : "type-630",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10980,8 +11326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10989,8 +11335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-139",
+   "self_type" : "type-1527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10998,8 +11344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "type-193",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11007,8 +11353,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11016,17 +11362,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-123",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11034,8 +11389,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11043,8 +11398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-491",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11052,8 +11407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-501",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11061,8 +11416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-929",
+   "referenced_type" : "type-929",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11071,7 +11426,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-80",
-   "self_type" : "type-956",
+   "self_type" : "type-997",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11079,8 +11434,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-646",
+   "referenced_type" : "type-482",
+   "self_type" : "type-671",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11088,8 +11452,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-972",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1014",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11097,8 +11461,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-953",
-   "self_type" : "type-961",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11106,8 +11470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-370",
+   "referenced_type" : "type-103",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11115,8 +11479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11124,8 +11488,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-198",
+   "self_type" : "type-1207",
    "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"
   },
@@ -11142,8 +11506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11151,8 +11515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11169,8 +11533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-29",
+   "referenced_type" : "type-16",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11178,8 +11542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-260",
+   "referenced_type" : "type-24",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11187,8 +11551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-416",
+   "referenced_type" : "type-415",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11196,8 +11560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11205,8 +11569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
+   "referenced_type" : "type-230",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11214,8 +11578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-219",
+   "referenced_type" : "type-213",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11223,8 +11587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11232,8 +11596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-440",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11241,8 +11605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11250,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11259,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11268,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11277,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-237",
+   "referenced_type" : "type-191",
+   "self_type" : "type-242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11286,8 +11650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-407",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11295,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11304,8 +11668,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-490",
-   "self_type" : "type-489",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11313,8 +11677,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-194",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11322,8 +11686,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-265",
-   "self_type" : "type-278",
+   "referenced_type" : "type-268",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11331,8 +11695,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-352",
-   "self_type" : "type-363",
+   "referenced_type" : "type-335",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11340,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11349,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-625",
+   "referenced_type" : "type-528",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11358,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-916",
+   "referenced_type" : "type-499",
+   "self_type" : "type-927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11368,7 +11732,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1442",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11376,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11385,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11394,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-609",
+   "referenced_type" : "type-57",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11403,8 +11767,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1085",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11412,8 +11776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-885",
+   "referenced_type" : "type-912",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11421,8 +11785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-43",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11430,8 +11794,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11439,8 +11803,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11448,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11457,8 +11821,8 @@
    "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-1217",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11466,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11475,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11484,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11493,8 +11857,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1558",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11502,8 +11866,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-249",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11511,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11520,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-656",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11529,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-584",
+   "self_type" : "type-599",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11538,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-558",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11547,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-699",
+   "referenced_type" : "type-752",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11556,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11565,8 +11929,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-181",
+   "referenced_type" : "type-181",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11574,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
+   "referenced_type" : "type-125",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11583,8 +11947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-175",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11592,8 +11956,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-171",
+   "referenced_type" : "type-175",
+   "self_type" : "type-176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11601,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11610,8 +11983,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-1427",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11619,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11628,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11637,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11646,8 +12019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-614",
+   "referenced_type" : "type-619",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11655,8 +12028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11664,8 +12037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11673,8 +12046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "referenced_type" : "type-357",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11682,8 +12055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11691,8 +12064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-336",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11700,8 +12073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11709,8 +12082,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11718,8 +12091,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-317",
+   "referenced_type" : "type-321",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11727,8 +12100,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-223",
-   "self_type" : "type-224",
+   "referenced_type" : "type-228",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11736,8 +12109,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-319",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11745,8 +12118,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11754,8 +12127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11763,8 +12136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11772,8 +12145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11781,8 +12154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "type-590",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11790,8 +12163,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11799,8 +12172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-323",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11808,8 +12181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11817,8 +12190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11826,8 +12199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-150",
+   "referenced_type" : "type-142",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11835,8 +12208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11844,8 +12217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-569",
-   "self_type" : "type-570",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11853,8 +12226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-746",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11862,8 +12235,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11871,8 +12244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-134",
+   "referenced_type" : "type-138",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11880,8 +12253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
+   "referenced_type" : "type-333",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11889,8 +12262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11898,17 +12271,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-692",
+   "referenced_type" : "type-743",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11916,8 +12298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11925,8 +12307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-942",
+   "referenced_type" : "type-934",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11934,8 +12316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11943,8 +12325,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-466",
+   "referenced_type" : "type-480",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11952,8 +12334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11961,8 +12343,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1575",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11970,8 +12352,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11979,8 +12361,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1579",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11988,8 +12379,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11997,8 +12388,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12006,8 +12397,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12015,8 +12406,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12024,8 +12415,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1467",
    "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"
   },
@@ -12033,8 +12424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12042,8 +12433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-288",
+   "referenced_type" : "type-290",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12051,8 +12442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1413",
    "size" : 4,
    "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"
   },
@@ -12060,8 +12451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-49",
+   "self_type" : "type-1537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12069,8 +12460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-264",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12078,7 +12469,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -12087,8 +12478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12096,8 +12487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12105,8 +12496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-222",
+   "referenced_type" : "type-212",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12114,8 +12505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-218",
+   "referenced_type" : "type-221",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12123,8 +12514,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-451",
+   "referenced_type" : "type-453",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12132,8 +12523,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-236",
+   "referenced_type" : "type-239",
+   "self_type" : "type-241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12141,8 +12532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12150,8 +12541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12159,8 +12550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12168,8 +12559,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-240",
+   "referenced_type" : "type-190",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12177,8 +12568,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-427",
+   "referenced_type" : "type-406",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12186,8 +12577,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-590",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12195,8 +12586,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-507",
-   "self_type" : "type-506",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12204,8 +12595,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-980",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12213,8 +12604,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-1462",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12222,8 +12613,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-283",
-   "self_type" : "type-286",
+   "referenced_type" : "type-281",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12231,8 +12622,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-364",
-   "self_type" : "type-371",
+   "referenced_type" : "type-369",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12240,8 +12631,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12249,8 +12640,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-944",
-   "self_type" : "type-957",
+   "referenced_type" : "type-951",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12258,8 +12649,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-1445",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12267,8 +12658,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12276,8 +12667,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12285,7 +12676,7 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-391",
    "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -12294,8 +12685,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12303,8 +12694,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12312,8 +12703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-865",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12321,8 +12712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1098",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12330,8 +12721,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12339,8 +12730,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1024",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12348,8 +12739,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-582",
+   "referenced_type" : "type-392",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12357,8 +12748,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-644",
+   "referenced_type" : "type-170",
+   "self_type" : "type-654",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12367,7 +12758,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-90",
-   "self_type" : "type-104",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12376,7 +12767,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1519",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12385,7 +12776,7 @@
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
    "referenced_type" : "type-83",
-   "self_type" : "type-1160",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12393,8 +12784,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12402,8 +12793,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12411,8 +12802,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-42",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12424,8 +12815,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12434,8 +12825,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12444,8 +12835,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12454,8 +12845,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12464,8 +12855,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-250",
-   "self_type" : "type-252",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12474,8 +12865,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-441",
-   "self_type" : "type-443",
+   "referenced_type" : "type-255",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12484,8 +12875,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
+   "referenced_type" : "type-456",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12494,8 +12885,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-714",
-   "self_type" : "type-716",
+   "referenced_type" : "type-658",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12504,8 +12895,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-785",
-   "self_type" : "type-787",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12514,8 +12905,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
+   "referenced_type" : "type-838",
+   "self_type" : "type-841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12534,8 +12925,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-958",
-   "self_type" : "type-960",
+   "referenced_type" : "type-916",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12544,8 +12935,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-144",
+   "referenced_type" : "type-17",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12554,8 +12945,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-643",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-653",
+   "self_type" : "type-1106",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12565,7 +12956,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-882",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12574,8 +12965,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12584,8 +12975,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12594,8 +12985,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-50",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-36",
+   "self_type" : "type-1361",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12604,8 +12995,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-143",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-148",
+   "self_type" : "type-1174",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12614,8 +13005,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-1206",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1229",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12624,8 +13015,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-1220",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1245",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12634,8 +13025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1205",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12644,8 +13035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1551",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12654,8 +13045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-584",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-607",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12664,8 +13055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1557",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12674,8 +13065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-241",
-   "self_type" : "type-248",
+   "referenced_type" : "type-246",
+   "self_type" : "type-253",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12684,8 +13075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12694,8 +13085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-617",
-   "self_type" : "type-622",
+   "referenced_type" : "type-648",
+   "self_type" : "type-656",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12704,8 +13095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-581",
+   "referenced_type" : "type-552",
+   "self_type" : "type-584",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12714,8 +13105,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-526",
+   "referenced_type" : "type-248",
+   "self_type" : "type-537",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12724,8 +13115,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12734,8 +13125,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-698",
+   "referenced_type" : "type-483",
+   "self_type" : "type-752",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12744,8 +13135,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12754,8 +13145,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12765,7 +13156,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-135",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12775,7 +13166,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-76",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12785,7 +13176,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12794,8 +13195,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-973",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1507",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12804,8 +13205,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-954",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1501",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12814,8 +13215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12824,8 +13225,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-1002",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12834,8 +13235,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-104",
+   "self_type" : "type-1437",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12844,8 +13245,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-242",
-   "self_type" : "type-610",
+   "referenced_type" : "type-247",
+   "self_type" : "type-619",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12854,8 +13255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1482",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12864,8 +13265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12874,8 +13275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-354",
+   "self_type" : "type-357",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12884,8 +13285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-350",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12894,8 +13295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-343",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12904,8 +13305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1438",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12914,8 +13315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12924,8 +13325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12934,8 +13335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-417",
+   "self_type" : "type-1454",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12944,8 +13345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-408",
+   "referenced_type" : "type-140",
+   "self_type" : "type-411",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12954,8 +13355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-316",
+   "referenced_type" : "type-195",
+   "self_type" : "type-321",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12964,8 +13365,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-223",
+   "referenced_type" : "type-215",
+   "self_type" : "type-228",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12974,8 +13375,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-314",
+   "referenced_type" : "type-219",
+   "self_type" : "type-319",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12984,8 +13385,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1434",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12994,8 +13395,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-703",
+   "referenced_type" : "type-486",
+   "self_type" : "type-756",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13004,8 +13405,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-487",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13014,8 +13415,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13024,8 +13425,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-464",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13034,8 +13435,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1436",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13044,8 +13445,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-157",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13054,8 +13455,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13064,8 +13465,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13074,8 +13475,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-185",
+   "self_type" : "type-1571",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13084,8 +13485,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1489",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -13094,8 +13495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-359",
+   "referenced_type" : "type-361",
+   "self_type" : "type-365",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -13104,8 +13505,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-567",
+   "referenced_type" : "type-587",
+   "self_type" : "type-590",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -13115,7 +13516,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-88",
-   "self_type" : "type-112",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13125,7 +13526,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-79",
-   "self_type" : "type-173",
+   "self_type" : "type-178",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13135,7 +13536,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-96",
-   "self_type" : "type-169",
+   "self_type" : "type-174",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13145,7 +13546,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-89",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13155,7 +13556,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-97",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13164,8 +13565,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-444",
+   "self_type" : "type-1456",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -13174,8 +13575,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-318",
+   "referenced_type" : "type-194",
+   "self_type" : "type-323",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -13184,8 +13585,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-549",
+   "referenced_type" : "type-410",
+   "self_type" : "type-570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -13195,7 +13596,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13204,8 +13605,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-573",
+   "referenced_type" : "type-102",
+   "self_type" : "type-597",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13214,8 +13615,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -13224,8 +13625,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13234,8 +13635,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-142",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -13244,8 +13645,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-361",
+   "referenced_type" : "type-207",
+   "self_type" : "type-367",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -13254,8 +13655,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-569",
+   "referenced_type" : "type-421",
+   "self_type" : "type-593",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13264,8 +13665,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-694",
+   "referenced_type" : "type-632",
+   "self_type" : "type-746",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -13275,7 +13676,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13284,8 +13685,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-461",
+   "self_type" : "type-1458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13294,8 +13695,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-139",
+   "self_type" : "type-138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -13304,8 +13705,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-328",
+   "referenced_type" : "type-193",
+   "self_type" : "type-333",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -13314,8 +13715,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-409",
+   "self_type" : "type-581",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -13324,18 +13725,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-690",
+   "referenced_type" : "type-623",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-119",
-   "self_type" : "type-122",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13345,7 +13766,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13354,8 +13775,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1497",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13364,8 +13785,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-501",
+   "self_type" : "type-1520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13374,8 +13795,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-165",
+   "self_type" : "type-1099",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13384,8 +13805,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-920",
-   "self_type" : "type-935",
+   "referenced_type" : "type-929",
+   "self_type" : "type-934",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13395,7 +13816,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-80",
-   "self_type" : "type-897",
+   "self_type" : "type-919",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13404,8 +13825,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-571",
+   "referenced_type" : "type-482",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13414,8 +13835,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-465",
+   "referenced_type" : "type-473",
+   "self_type" : "type-480",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13424,8 +13845,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1572",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13435,7 +13856,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-84",
-   "self_type" : "type-1501",
+   "self_type" : "type-1574",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13445,7 +13866,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-75",
-   "self_type" : "type-1507",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13455,7 +13876,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-92",
-   "self_type" : "type-1504",
+   "self_type" : "type-1577",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13464,8 +13895,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-953",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-994",
+   "self_type" : "type-1460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13474,8 +13905,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13484,8 +13915,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1032",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13494,8 +13925,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-103",
+   "self_type" : "type-1048",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13504,8 +13935,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13514,8 +13945,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-1390",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1466",
    "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"
   },
@@ -13524,8 +13955,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-1092",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1120",
    "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"
   },
@@ -13535,7 +13966,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-1233",
+   "self_type" : "type-1251",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13544,8 +13975,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-1232",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1279",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13554,8 +13985,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-267",
-   "self_type" : "type-287",
+   "referenced_type" : "type-270",
+   "self_type" : "type-290",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13564,8 +13995,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-1342",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13574,8 +14005,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-1341",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1417",
    "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"
   },
@@ -13584,8 +14015,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-354",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-1412",
    "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"
   },
@@ -13594,8 +14025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13604,8 +14035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13614,8 +14045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-420",
+   "referenced_type" : "type-415",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13624,8 +14055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-401",
+   "referenced_type" : "type-372",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13634,8 +14065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13644,8 +14075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "type-213",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13654,8 +14085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-217",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13664,8 +14095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-444",
+   "referenced_type" : "type-442",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13674,8 +14105,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-231",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13684,8 +14115,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13694,8 +14125,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-486",
+   "referenced_type" : "type-459",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13704,8 +14135,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13714,8 +14145,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "type-191",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13724,8 +14155,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13734,8 +14165,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +14175,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-490",
-   "self_type" : "type-507",
+   "referenced_type" : "type-496",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13754,8 +14185,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-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13764,8 +14195,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-194",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13774,8 +14205,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-265",
-   "self_type" : "type-283",
+   "referenced_type" : "type-268",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13784,8 +14215,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-352",
-   "self_type" : "type-364",
+   "referenced_type" : "type-335",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13794,8 +14225,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13804,8 +14235,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-493",
-   "self_type" : "type-944",
+   "referenced_type" : "type-499",
+   "self_type" : "type-951",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13815,7 +14246,7 @@
    "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-3",
-   "self_type" : "type-1445",
+   "self_type" : "type-1519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13824,8 +14255,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-296",
+   "referenced_type" : "type-39",
+   "self_type" : "type-297",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13834,8 +14265,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13844,8 +14275,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13855,7 +14286,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-91",
-   "self_type" : "type-876",
+   "self_type" : "type-908",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13864,8 +14295,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-807",
-   "self_type" : "type-872",
+   "referenced_type" : "type-835",
+   "self_type" : "type-906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13874,8 +14305,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13883,96 +14314,96 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1213",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1562",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/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-662",
+   "self_type" : "type-661",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-946",
-   "self_type" : "type-945",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13980,8 +14411,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13990,8 +14421,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-860",
+   "referenced_type" : "type-32",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14000,8 +14431,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14010,8 +14441,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-854",
+   "referenced_type" : "type-730",
+   "self_type" : "type-884",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14020,8 +14451,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-849",
-   "self_type" : "type-848",
+   "referenced_type" : "type-864",
+   "self_type" : "type-863",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14030,8 +14461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14040,8 +14471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1165",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14050,8 +14481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1268",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14060,8 +14491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14070,8 +14501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14080,8 +14511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14090,8 +14521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-560",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14100,8 +14531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14110,8 +14541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14120,8 +14551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14130,8 +14561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14140,8 +14571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-915",
-   "self_type" : "type-914",
+   "referenced_type" : "type-977",
+   "self_type" : "type-976",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14150,8 +14581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14160,8 +14591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14170,8 +14601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14180,8 +14611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14190,8 +14621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14200,8 +14631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14210,8 +14641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14220,8 +14651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14230,8 +14661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14240,8 +14671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14250,8 +14681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14260,8 +14691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-905",
-   "self_type" : "type-904",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14270,8 +14701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1065",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14280,8 +14711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14290,8 +14721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1263",
+   "self_type" : "type-1262",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14300,8 +14731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14310,8 +14741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14320,8 +14751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-312",
+   "self_type" : "type-311",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14330,8 +14761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14340,8 +14771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14350,8 +14781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14360,8 +14791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14370,8 +14801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-834",
-   "self_type" : "type-833",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14380,8 +14811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14390,8 +14821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14400,8 +14831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14410,8 +14841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14420,8 +14851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14430,8 +14861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14440,8 +14871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14450,8 +14881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14460,8 +14891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14470,8 +14901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14480,8 +14911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-742",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14490,8 +14921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14500,8 +14931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-968",
+   "self_type" : "type-967",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14510,8 +14941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1063",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14520,8 +14951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14530,8 +14961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14540,8 +14971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14550,8 +14981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14560,8 +14991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14570,8 +15001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14580,8 +15011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14590,8 +15021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14600,8 +15031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14610,8 +15041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-831",
-   "self_type" : "type-830",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14620,8 +15051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-906",
+   "referenced_type" : "type-964",
+   "self_type" : "type-963",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14630,8 +15061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14640,8 +15071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14650,8 +15081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1266",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14660,8 +15091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14670,8 +15101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14680,8 +15111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14690,8 +15121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14700,8 +15131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14710,8 +15141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14720,8 +15151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14730,8 +15161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-838",
-   "self_type" : "type-837",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14740,8 +15171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-913",
-   "self_type" : "type-912",
+   "referenced_type" : "type-970",
+   "self_type" : "type-969",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14750,8 +15181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14760,8 +15191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14770,8 +15201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14780,8 +15211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14790,8 +15221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14800,8 +15231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14810,8 +15241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14820,8 +15251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "type-61",
+   "self_type" : "type-60",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14830,8 +15261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14840,8 +15271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14850,8 +15281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-877",
+   "self_type" : "type-876",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14860,8 +15291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14870,8 +15301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14880,8 +15311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14890,8 +15321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1109",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14900,8 +15331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1272",
+   "self_type" : "type-1271",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14910,8 +15341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14920,8 +15351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14930,8 +15361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-562",
+   "self_type" : "type-561",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14940,8 +15371,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-918",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14950,18 +15401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
-   "size" : 28,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14980,8 +15421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1170",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14990,8 +15431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15000,8 +15441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15010,8 +15451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15020,8 +15461,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15030,18 +15501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
-   "size" : 24,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15060,8 +15521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15070,8 +15531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15080,8 +15541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15090,8 +15551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15100,8 +15561,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15110,8 +15601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15120,8 +15611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1175",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15140,8 +15631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15150,8 +15641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15160,8 +15651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-332",
+   "self_type" : "type-331",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15170,8 +15661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15180,8 +15671,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-926",
-   "self_type" : "type-925",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -15190,8 +15701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-1124",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1182",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15200,8 +15711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15210,48 +15721,168 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-137",
+   "self_type" : "type-136",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-993",
+   "self_type" : "type-992",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1280",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-130",
    "self_type" : "type-129",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15260,8 +15891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15270,8 +15901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15280,8 +15911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15290,8 +15921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15300,8 +15931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15310,8 +15941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1180",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15320,8 +15951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-1262",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15330,8 +15961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15340,8 +15971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15350,8 +15981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -15360,638 +15991,708 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1034",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::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",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-680",
+   "self_type" : "type-679",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-854",
+   "self_type" : "type-853",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "referenced_type" : "type-931",
    "self_type" : "type-930",
-   "size" : 68,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1117",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::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",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1254",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-707",
+   "self_type" : "type-706",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-875",
+   "self_type" : "type-874",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-705",
+   "self_type" : "type-704",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1039",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1208",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1233",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-861",
+   "self_type" : "type-860",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1016",
+   "self_type" : "type-1015",
+   "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-1031",
+   "self_type" : "type-1030",
+   "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-1119",
+   "self_type" : "type-1118",
+   "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-1220",
+   "self_type" : "type-1219",
+   "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-1568",
+   "self_type" : "type-1567",
+   "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-265",
+   "self_type" : "type-264",
+   "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-471",
+   "self_type" : "type-470",
+   "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-667",
+   "self_type" : "type-666",
+   "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-850",
+   "self_type" : "type-849",
+   "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-926",
+   "self_type" : "type-925",
+   "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-1004",
+   "self_type" : "type-1003",
+   "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-1029",
+   "self_type" : "type-1028",
+   "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-1117",
+   "self_type" : "type-1116",
+   "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-1218",
+   "self_type" : "type-1217",
+   "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-1566",
+   "self_type" : "type-1565",
+   "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-262",
+   "self_type" : "type-261",
+   "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-468",
+   "self_type" : "type-467",
+   "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-665",
+   "self_type" : "type-664",
+   "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-848",
+   "self_type" : "type-847",
+   "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-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "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-1001",
+   "self_type" : "type-1000",
+   "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-1092",
+   "self_type" : "type-1091",
+   "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-1201",
+   "self_type" : "type-1200",
+   "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-1358",
+   "self_type" : "type-1357",
+   "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-1513",
    "self_type" : "type-1512",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.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-1000",
-   "self_type" : "type-999",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1090",
-   "self_type" : "type-1089",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-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"
-  },
-  {
-   "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-671",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1181",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-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"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-998",
-   "self_type" : "type-997",
-   "size" : 3,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1169",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1202",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1521",
-   "self_type" : "type-1520",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-505",
-   "self_type" : "type-504",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-985",
-   "self_type" : "type-984",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.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-1061",
-   "self_type" : "type-1060",
-   "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-1154",
-   "self_type" : "type-1153",
-   "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-1495",
-   "self_type" : "type-1494",
-   "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-259",
-   "self_type" : "type-258",
-   "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-453",
-   "self_type" : "type-452",
-   "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-640",
-   "self_type" : "type-639",
-   "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-796",
-   "self_type" : "type-795",
-   "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-874",
-   "self_type" : "type-873",
-   "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-970",
-   "self_type" : "type-969",
-   "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-995",
-   "self_type" : "type-994",
-   "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-1059",
-   "self_type" : "type-1058",
-   "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-1152",
-   "self_type" : "type-1151",
-   "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-1493",
-   "self_type" : "type-1492",
-   "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-257",
-   "self_type" : "type-256",
-   "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-450",
-   "self_type" : "type-449",
-   "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-638",
-   "self_type" : "type-637",
-   "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-794",
-   "self_type" : "type-793",
-   "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-871",
-   "self_type" : "type-870",
-   "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-963",
-   "self_type" : "type-962",
-   "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-968",
-   "self_type" : "type-967",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+   "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-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16000,8 +16701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16010,8 +16711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16020,8 +16721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16030,8 +16731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16040,8 +16741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16050,58 +16751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
-   "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-588",
-   "self_type" : "type-587",
-   "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-769",
-   "self_type" : "type-768",
-   "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-846",
-   "self_type" : "type-845",
-   "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-852",
-   "self_type" : "type-851",
-   "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-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16111,7 +16762,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-90",
-   "self_type" : "type-1043",
+   "self_type" : "type-1084",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16121,7 +16772,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-51",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16131,7 +16782,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-83",
-   "self_type" : "type-865",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16140,8 +16791,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-856",
+   "referenced_type" : "type-396",
+   "self_type" : "type-892",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16149,8 +16800,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-29",
+   "self_type" : "type-1097",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -16158,8 +16809,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-39",
+   "self_type" : "type-300",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -16168,8 +16819,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-58",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -16183,14 +16834,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -16202,17 +16853,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-51"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-44", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -16222,37 +16873,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
+     "referenced_type" : "type-652"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
+   "name" : "android::LightRefBase<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-653" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
      "referenced_type" : "type-642"
     }
    ],
-   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
-   "name" : "android::LightRefBase<android::NativeHandle>",
+   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
+   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
    "referenced_type" : "type-641",
    "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "template_args" : [ "type-643" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-633" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -16262,14 +16913,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-34"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -16281,14 +16932,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1398"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1323",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -16298,7 +16949,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-651"
     }
    ],
    "fields" :
@@ -16307,20 +16958,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -16332,14 +16983,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -16351,14 +17002,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1406"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -16370,14 +17021,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1406"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -16448,8 +17099,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-892",
-   "self_type" : "type-892",
+   "referenced_type" : "type-915",
+   "self_type" : "type-915",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -16459,8 +17110,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -16492,8 +17143,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -16504,17 +17155,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-52"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -16561,14 +17212,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -16626,14 +17277,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-45"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -16645,14 +17296,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -16672,62 +17323,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-297"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -16817,17 +17468,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -16874,7 +17525,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
@@ -16886,20 +17537,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -16951,14 +17602,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-641"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-643",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -16986,7 +17637,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -16995,32 +17646,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -17136,7 +17787,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     },
     {
      "access" : "private",
@@ -17148,14 +17799,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -17243,23 +17894,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17432,23 +18083,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17633,23 +18284,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17826,23 +18477,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18119,23 +18770,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18312,23 +18963,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -18501,23 +19152,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18694,23 +19345,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -19027,23 +19678,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -19216,23 +19867,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -19421,23 +20072,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -19618,23 +20269,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -19871,6 +20522,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -19979,23 +20634,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-635",
+   "self_type" : "type-635",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -20068,6 +20723,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -20179,17 +20838,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -20359,23 +21018,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1222"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1223"
     }
    ],
    "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-1206",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1221",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-1209" ],
+   "template_args" : [ "type-3", "type-1224" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -20385,23 +21044,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1237"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1222"
+     "referenced_type" : "type-1238"
     }
    ],
    "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-1220",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1236",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-39" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -20411,23 +21070,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-1248"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1231"
+     "referenced_type" : "type-1249"
     }
    ],
    "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-1229",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1247",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1232", "type-1047" ],
+   "template_args" : [ "type-1250", "type-1088" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -20437,23 +21096,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1307"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1308"
     }
    ],
    "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-1279",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1306",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1282", "type-1283" ],
+   "template_args" : [ "type-1309", "type-1310" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -20463,23 +21122,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1266"
+     "referenced_type" : "type-1290"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1267"
+     "referenced_type" : "type-1291"
     }
    ],
    "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-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1289",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-1268", "type-1269" ],
+   "template_args" : [ "type-1292", "type-1293" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -20508,8 +21167,8 @@
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -20520,7 +21179,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-920"
+     "referenced_type" : "type-929"
     },
     {
      "is_virtual" : true,
@@ -20530,8 +21189,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-943",
-   "self_type" : "type-943",
+   "referenced_type" : "type-950",
+   "self_type" : "type-950",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -20618,8 +21277,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -20823,8 +21482,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -20906,13 +21565,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-971"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1103"
     },
     {
      "access" : "private",
@@ -20929,11 +21588,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -20949,19 +21608,19 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1193"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
@@ -20985,7 +21644,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1194"
     },
     {
      "access" : "private",
@@ -21015,38 +21674,38 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 448,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 456,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 464,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-1195"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -21073,8 +21732,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -21094,25 +21753,25 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
@@ -21130,86 +21789,86 @@
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-35"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 512,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-40"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-54"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 800,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 808,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -21287,7 +21946,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -21297,8 +21956,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -21308,7 +21967,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21317,17 +21976,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1424"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1351" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -21335,7 +21994,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21344,17 +22003,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-460" ],
+   "template_args" : [ "type-459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -21362,7 +22021,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21371,17 +22030,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1526"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1453" ],
+   "template_args" : [ "type-1526" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -21389,7 +22048,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21398,17 +22057,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-186" ],
+   "template_args" : [ "type-191" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -21416,7 +22075,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21425,17 +22084,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-407" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -21443,7 +22102,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21452,17 +22111,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-591" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -21470,7 +22129,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -21479,17 +22138,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21497,17 +22156,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21517,26 +22176,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -21546,34 +22205,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1319",
+   "self_type" : "type-1319",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1221" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1351",
+   "self_type" : "type-1351",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1236" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1320"
+    }
+   ],
+   "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-1359",
+   "self_type" : "type-1359",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1247" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -21602,18 +22321,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1224",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -21625,14 +22344,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -21641,8 +22360,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -21651,8 +22370,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -21661,8 +22380,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -21682,8 +22401,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-86",
    "self_type" : "type-86",
@@ -21698,7 +22417,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
@@ -21706,11 +22425,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -21722,7 +22441,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-974"
     },
     {
      "field_name" : "_pad",
@@ -21730,11 +22449,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -21746,7 +22465,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -21754,11 +22473,35 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-485"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-83"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -21770,7 +22513,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
@@ -21778,11 +22521,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -21802,8 +22545,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-77",
    "self_type" : "type-77",
@@ -21818,7 +22561,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "_pad",
@@ -21826,11 +22569,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -21842,7 +22585,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     },
     {
      "field_name" : "_pad",
@@ -21850,11 +22593,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -21874,8 +22617,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-94",
    "self_type" : "type-94",
@@ -21889,16 +22632,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-950"
+     "referenced_type" : "type-973"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-975" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -21907,16 +22650,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -21925,16 +22668,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -21943,16 +22686,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -21961,16 +22704,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -22033,13 +22776,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-74" ],
@@ -22051,16 +22794,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-1008"
     }
    ],
    "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-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-1010" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22069,13 +22830,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-996"
     }
    ],
    "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-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-995",
+   "self_type" : "type-995",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-80" ],
@@ -22087,16 +22848,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -22105,16 +22866,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1058"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22124,7 +22885,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-609"
+     "referenced_type" : "type-615"
     },
     {
      "field_name" : "_pad",
@@ -22132,11 +22893,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22156,7 +22917,7 @@
    "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22166,7 +22927,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
      "field_name" : "_pad",
@@ -22174,8 +22935,8 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-82",
    "self_type" : "type-82",
@@ -22189,16 +22950,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22208,7 +22969,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "_pad",
@@ -22216,11 +22977,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22232,7 +22993,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-975"
+     "referenced_type" : "type-1009"
     },
     {
      "field_name" : "_pad",
@@ -22240,11 +23001,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-974",
-   "self_type" : "type-974",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -22256,7 +23017,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-956"
+     "referenced_type" : "type-997"
     },
     {
      "field_name" : "_pad",
@@ -22264,11 +23025,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-996",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22280,7 +23041,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
@@ -22288,11 +23049,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -22303,16 +23064,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1003"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22322,7 +23083,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1004"
+     "referenced_type" : "type-1024"
     },
     {
      "field_name" : "_pad",
@@ -22330,11 +23091,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22345,16 +23106,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22364,7 +23125,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "field_name" : "_pad",
@@ -22372,11 +23133,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22387,13 +23148,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-90" ],
@@ -22406,7 +23167,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "_pad",
@@ -22414,11 +23175,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -22427,8 +23188,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -22440,20 +23201,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22462,8 +23223,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -22473,8 +23234,8 @@
    "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-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -22485,7 +23246,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22494,13 +23255,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1476",
+   "self_type" : "type-1476",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -22622,7 +23383,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22631,13 +23392,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -22759,7 +23520,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22768,13 +23529,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -22896,7 +23657,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -22905,13 +23666,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -23033,7 +23794,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23042,13 +23803,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -23170,10 +23931,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1149"
+     "referenced_type" : "type-1188"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23182,19 +23943,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1479"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1407"
+     "referenced_type" : "type-1480"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -23383,10 +24144,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1187"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23395,19 +24156,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1472"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1471",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -23605,10 +24366,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23617,19 +24378,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -23821,10 +24582,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -23833,19 +24594,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -24112,10 +24873,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24124,19 +24885,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-341"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -24329,23 +25090,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-164"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-160"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -24360,8 +25121,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -24483,8 +25244,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -24618,8 +25379,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -24745,8 +25506,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -24972,8 +25733,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -25095,18 +25856,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -25127,8 +25888,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -25149,8 +25910,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -25161,13 +25922,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -25193,8 +25954,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -25215,8 +25976,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -25226,7 +25987,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25235,13 +25996,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -25363,7 +26124,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25372,13 +26133,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -25500,7 +26261,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25509,13 +26270,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -25637,10 +26398,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1189"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -25649,19 +26410,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1413"
+     "referenced_type" : "type-1487"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1414"
+     "referenced_type" : "type-1488"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1486",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -25850,10 +26611,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -25862,19 +26623,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -26066,10 +26827,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26078,19 +26839,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -26415,7 +27176,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -26479,7 +27240,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -26505,13 +27266,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -26628,13 +27389,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -26755,13 +27516,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -27023,13 +27784,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -27039,7 +27800,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27048,13 +27809,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-1284",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1313",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -27176,7 +27937,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27185,13 +27946,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1526"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1529",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -27313,7 +28074,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27322,13 +28083,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -27450,7 +28211,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27459,13 +28220,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -27587,7 +28348,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -27596,13 +28357,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -27724,10 +28485,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1191"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27736,19 +28497,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1420"
+     "referenced_type" : "type-1494"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1495"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1493",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -27937,10 +28698,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27949,19 +28710,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -28162,10 +28923,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28174,19 +28935,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-208"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -28381,10 +29142,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28393,19 +29154,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-422"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -28599,6 +29360,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -28723,10 +29487,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28735,19 +29499,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-603"
+     "referenced_type" : "type-633"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -28818,6 +29582,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -28942,10 +29709,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28954,19 +29721,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -29097,10 +29864,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29109,19 +29876,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1525"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -29264,10 +30031,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29276,19 +30043,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -29425,10 +30192,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29437,19 +30204,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -29643,6 +30410,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -29709,10 +30479,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -29721,19 +30491,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -29804,6 +30574,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -29870,13 +30643,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -29993,13 +30766,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -30132,13 +30905,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -30263,13 +31036,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -30508,6 +31281,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -30558,13 +31335,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -30639,6 +31416,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -30685,19 +31466,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-103"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-122"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1045"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30710,13 +31513,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-977"
+     "referenced_type" : "type-1011"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1010",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30736,7 +31539,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
@@ -30753,8 +31556,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 40,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -30839,8 +31642,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -30922,19 +31725,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30946,7 +31749,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "access" : "private",
@@ -30963,8 +31766,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-929",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -30988,7 +31791,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -31006,7 +31809,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-972"
     },
     {
      "access" : "private",
@@ -31018,16 +31821,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-975" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -31037,7 +31840,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-483"
     },
     {
      "access" : "private",
@@ -31049,16 +31852,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -31068,7 +31871,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -31080,16 +31883,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -31099,7 +31902,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-491"
     },
     {
      "access" : "private",
@@ -31111,16 +31914,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -31130,7 +31933,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
@@ -31142,16 +31945,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -31173,7 +31976,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -31204,7 +32007,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -31235,7 +32038,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -31254,7 +32057,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -31266,13 +32069,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-74" ],
@@ -31285,7 +32088,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -31297,16 +32100,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-1007"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-39"
     }
    ],
    "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-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1006",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-1010" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -31316,7 +32150,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-995"
     },
     {
      "access" : "private",
@@ -31328,13 +32162,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-80" ],
@@ -31347,7 +32181,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -31359,16 +32193,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -31378,7 +32212,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1057"
     },
     {
      "access" : "private",
@@ -31390,16 +32224,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -31409,7 +32243,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1002"
+     "referenced_type" : "type-1022"
     },
     {
      "access" : "private",
@@ -31421,16 +32255,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1021",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -31440,7 +32274,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -31452,13 +32286,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -31471,19 +32305,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -31493,10 +32327,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -31505,13 +32339,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -31633,10 +32467,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1142"
+     "referenced_type" : "type-1186"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -31645,19 +32479,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1464"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1465"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1463",
    "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",
@@ -31841,7 +32675,7 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
@@ -31851,13 +32685,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1091",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "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"
@@ -31988,8 +32822,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "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",
@@ -32141,23 +32975,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-1001"
+     "referenced_type" : "type-1021"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1112"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1416",
    "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"
@@ -32172,8 +33006,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "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",
@@ -32288,17 +33122,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-295"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-296" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -32308,17 +33142,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32348,17 +33182,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -32368,17 +33202,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1539"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -32388,17 +33222,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-40" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -32408,17 +33242,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -32428,17 +33262,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -32448,17 +33282,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -32468,17 +33302,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -32488,17 +33322,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -32508,17 +33342,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-443"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-442",
+   "self_type" : "type-442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -32528,17 +33362,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -32548,17 +33382,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -32568,17 +33402,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -32588,17 +33422,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -32608,17 +33442,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -32628,17 +33462,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -32648,17 +33482,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -32668,17 +33502,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-491"
+     "referenced_type" : "type-497"
     }
    ],
    "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-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -32688,17 +33522,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32714,8 +33548,8 @@
    "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-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -32728,17 +33562,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-269"
     }
    ],
    "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-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-267" ],
+   "template_args" : [ "type-270" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -32748,47 +33582,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-336"
     }
    ],
    "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-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-354" ],
+   "template_args" : [ "type-337" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -32798,63 +33632,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -32864,8 +33698,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -32875,8 +33709,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -32886,63 +33720,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -32952,63 +33786,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-806",
-   "self_type" : "type-806",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33018,8 +33852,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33029,8 +33863,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33040,33 +33874,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -33077,26 +33911,26 @@
    "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -33106,63 +33940,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-708",
+   "self_type" : "type-708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33172,8 +34006,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33183,8 +34017,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33194,85 +34028,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "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-1139",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-44" ],
    "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-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-54" ],
    "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-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -33282,63 +34116,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-807" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-773" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -33348,8 +34182,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -33359,8 +34193,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -33370,33 +34204,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-779" ],
+   "template_args" : [ "type-801" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -33406,7 +34240,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     },
     {
      "access" : "private",
@@ -33418,11 +34252,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -33444,8 +34278,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -33458,7 +34292,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
@@ -33470,11 +34304,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -33509,18 +34343,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -33536,18 +34370,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1380"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1388"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -33558,7 +34392,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1384"
     },
     {
      "field_name" : "num_planes",
@@ -33568,13 +34402,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1386"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -33585,48 +34419,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1381"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -33637,38 +34471,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1389"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1316",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1390",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -33679,18 +34513,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -33701,17 +34535,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
@@ -33731,13 +34565,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1380"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -33747,13 +34581,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -33764,35 +34598,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-394"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v3",
      "referenced_type" : "type-395"
     },
     {
+     "field_name" : "entry_v4",
+     "referenced_type" : "type-395"
+    },
+    {
+     "field_name" : "entry_v3",
+     "referenced_type" : "type-398"
+    },
+    {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-400"
     }
    ],
    "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-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "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)"
@@ -33813,8 +34647,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1128",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -33825,43 +34659,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -33872,32 +34706,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -33907,13 +34741,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -33924,32 +34758,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -33959,13 +34793,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -33976,17 +34810,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -34016,13 +34850,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -34033,28 +34867,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-166"
+     "referenced_type" : "type-171"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -34066,8 +34900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34075,8 +34909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-584",
-   "self_type" : "type-586",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34084,8 +34918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34093,8 +34927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-241",
-   "self_type" : "type-246",
+   "referenced_type" : "type-246",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34102,8 +34936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-430",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34111,8 +34945,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-617",
-   "self_type" : "type-619",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34120,8 +34954,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-561",
-   "self_type" : "type-579",
+   "referenced_type" : "type-552",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34129,8 +34963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-620",
-   "self_type" : "type-626",
+   "referenced_type" : "type-629",
+   "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34138,8 +34972,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-540",
+   "referenced_type" : "type-248",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34147,8 +34981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-608",
+   "referenced_type" : "type-247",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -34156,8 +34990,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-160",
-   "self_type" : "type-934",
+   "referenced_type" : "type-165",
+   "self_type" : "type-933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -34165,8 +34999,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-920",
-   "self_type" : "type-941",
+   "referenced_type" : "type-929",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -34174,8 +35008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-375",
-   "self_type" : "type-387",
+   "referenced_type" : "type-372",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34183,8 +35017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-208",
-   "self_type" : "type-221",
+   "referenced_type" : "type-213",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34192,8 +35026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-212",
-   "self_type" : "type-415",
+   "referenced_type" : "type-217",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34201,8 +35035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-460",
-   "self_type" : "type-473",
+   "referenced_type" : "type-459",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34210,8 +35044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34219,8 +35053,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-186",
-   "self_type" : "type-238",
+   "referenced_type" : "type-191",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34228,8 +35062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-407",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34237,8 +35071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-591",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34246,8 +35080,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-496",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34255,8 +35089,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-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34264,8 +35098,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-1173",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34273,8 +35107,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-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34282,8 +35116,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-1525",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34291,8 +35125,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-280",
-   "self_type" : "type-279",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34300,8 +35134,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-512",
-   "self_type" : "type-511",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34309,8 +35143,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34318,8 +35152,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-812",
-   "self_type" : "type-811",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34327,8 +35161,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-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34336,8 +35170,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-989",
-   "self_type" : "type-988",
+   "referenced_type" : "type-943",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34345,8 +35179,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34354,8 +35188,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34363,8 +35197,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34372,8 +35206,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34381,8 +35215,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34390,8 +35224,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34399,8 +35233,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34408,8 +35242,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
+   "referenced_type" : "type-697",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34417,8 +35251,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34426,8 +35260,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34435,8 +35269,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34444,8 +35278,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34453,8 +35287,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34462,8 +35296,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34471,8 +35305,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34480,8 +35314,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34489,8 +35323,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34498,8 +35332,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34507,8 +35341,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -34516,8 +35350,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-945",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }

diff --git a/Q/64/x86/source-based/android.hardware.drm@1.2.so.lsdump b/Q/64/x86/source-based/android.hardware.drm@1.2.so.lsdump
index ad3dfab..f204c54 100644
--- a/Q/64/x86/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/64/x86/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-394",
+   "referenced_type" : "type-57",
+   "self_type" : "type-397",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-57",
+   "self_type" : "type-1033",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-792",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-834",
+   "self_type" : "type-1068",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-41",
-   "self_type" : "type-166",
+   "referenced_type" : "type-27",
+   "self_type" : "type-171",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-887",
+   "self_type" : "type-929",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-90",
-   "self_type" : "type-861",
+   "self_type" : "type-903",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-391",
+   "self_type" : "type-394",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1009",
+   "self_type" : "type-1060",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1
   },
   {
@@ -78,8 +87,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1
   },
   {
@@ -88,8 +97,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -104,8 +113,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 4
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 2
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1
   },
   {
@@ -179,8 +188,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4
   },
   {
@@ -199,15 +208,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -351,6 +360,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -474,6 +486,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -525,6 +540,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -993,6 +1011,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1032,6 +1053,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1047,6 +1071,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1065,6 +1092,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1601,8 +1634,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1619,8 +1652,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1637,8 +1670,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-954",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1663,11 +1696,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1693,11 +1726,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1715,8 +1748,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-941",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1741,11 +1774,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1795,11 +1828,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1849,8 +1882,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1138",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1871,8 +1904,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1905,8 +1938,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1935,8 +1968,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1969,8 +2002,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1995,8 +2028,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2025,8 +2058,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2091,8 +2124,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2235,8 +2268,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2294,6 +2327,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2415,11 +2486,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2433,11 +2504,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2459,8 +2530,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1094",
    "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-90",
@@ -2563,8 +2634,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2589,8 +2660,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2631,8 +2702,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2873,8 +2944,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2903,8 +2974,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2933,8 +3004,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -2975,8 +3046,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3013,8 +3084,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3039,8 +3110,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3057,8 +3128,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3087,8 +3158,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3181,8 +3252,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-992",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3223,8 +3294,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3241,8 +3312,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3271,8 +3342,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3305,8 +3376,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3359,8 +3430,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3376,18 +3447,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
-    },
-    {
-     "referenced_type" : "type-62"
-    },
-    {
      "referenced_type" : "type-42"
+    },
+    {
+     "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-41",
+   "return_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3397,12 +3468,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1021",
-   "return_type" : "type-41",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1072",
+   "return_type" : "type-27",
+   "self_type" : "type-1072",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3412,27 +3483,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-981"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-937",
-   "return_type" : "type-43",
-   "self_type" : "type-937",
+   "referenced_type" : "type-979",
+   "return_type" : "type-29",
+   "self_type" : "type-979",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3445,14 +3516,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3462,16 +3533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3481,13 +3552,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1285"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3497,13 +3568,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1286"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3513,14 +3584,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3530,13 +3601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3546,13 +3617,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1236"
+     "referenced_type" : "type-1287"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3562,14 +3633,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3579,13 +3650,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1288"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3595,10 +3666,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3608,10 +3679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3620,13 +3691,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3636,10 +3707,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3649,16 +3720,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3667,14 +3738,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3683,14 +3754,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3699,14 +3770,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3715,14 +3786,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3733,13 +3804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-1242"
+     "referenced_type" : "type-1293"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3749,13 +3820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3765,13 +3836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3781,14 +3852,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3798,16 +3869,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3817,13 +3888,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1321"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3833,13 +3904,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1322"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3849,14 +3920,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3866,13 +3937,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3882,13 +3953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1323"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3898,14 +3969,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3915,13 +3986,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1273"
+     "referenced_type" : "type-1324"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3931,10 +4002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3944,10 +4015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3956,13 +4027,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3972,10 +4043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3985,16 +4056,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4003,14 +4074,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-234"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4019,14 +4090,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-240"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4035,14 +4106,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4051,14 +4122,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4069,13 +4140,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-1277"
+     "referenced_type" : "type-1328"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4085,13 +4156,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4101,13 +4172,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4117,16 +4188,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -4134,10 +4205,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1331"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4148,13 +4219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1332"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4163,19 +4234,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1333"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4184,19 +4255,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1283"
+     "referenced_type" : "type-1334"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1335"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4205,19 +4297,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1284"
+     "referenced_type" : "type-1336"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4226,19 +4318,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1285"
+     "referenced_type" : "type-1337"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4247,19 +4339,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1286"
+     "referenced_type" : "type-1338"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4268,19 +4360,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1287"
+     "referenced_type" : "type-1339"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4289,19 +4381,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-1340"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4312,10 +4404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4325,13 +4417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4341,13 +4433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4357,10 +4449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4370,10 +4462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4383,10 +4475,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4396,13 +4488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1289"
+     "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4412,13 +4504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4428,16 +4520,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4447,13 +4539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-1342"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4463,16 +4555,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4482,13 +4574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4498,13 +4590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4514,13 +4606,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1343"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4530,13 +4622,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1292"
+     "referenced_type" : "type-1344"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4546,13 +4638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4562,28 +4654,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1294"
+     "referenced_type" : "type-1346"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4593,16 +4685,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1295"
+     "referenced_type" : "type-1347"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4612,13 +4704,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4628,13 +4720,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-1348"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4644,13 +4736,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1297"
+     "referenced_type" : "type-1349"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4660,16 +4752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1298"
+     "referenced_type" : "type-1350"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4679,19 +4771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4701,16 +4793,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1299"
+     "referenced_type" : "type-1351"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4720,16 +4812,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4739,13 +4831,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1300"
+     "referenced_type" : "type-1352"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4755,16 +4847,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1301"
+     "referenced_type" : "type-1353"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4774,13 +4866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4790,13 +4882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1354"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4806,28 +4898,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1303"
+     "referenced_type" : "type-1355"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4837,28 +4929,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1304"
+     "referenced_type" : "type-1356"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4868,16 +4960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1305"
+     "referenced_type" : "type-1357"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4887,13 +4979,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4903,16 +4995,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4922,19 +5014,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1306"
+     "referenced_type" : "type-1358"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4944,13 +5036,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-598"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-425"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4960,16 +5074,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4979,13 +5093,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4995,19 +5109,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5017,13 +5131,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1309"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5033,16 +5147,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5052,10 +5166,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5065,13 +5179,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5081,16 +5195,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5100,13 +5214,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5116,16 +5230,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5135,10 +5249,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5148,10 +5262,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5161,10 +5275,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5174,16 +5288,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-1363"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5192,16 +5306,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1364"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5210,31 +5324,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1313"
+     "referenced_type" : "type-1365"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5244,19 +5358,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1366"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1219"
+    },
+    {
+     "referenced_type" : "type-1194"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5266,16 +5404,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1367"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5284,16 +5422,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5302,16 +5440,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5321,13 +5459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1368"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5336,19 +5474,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1369"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5357,22 +5495,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-1370"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5381,16 +5519,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1319"
+     "referenced_type" : "type-1371"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5400,10 +5538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5413,22 +5551,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1372"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5438,16 +5576,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5457,25 +5595,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1321"
+     "referenced_type" : "type-1373"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5485,25 +5623,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1374"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5513,25 +5651,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1323"
+     "referenced_type" : "type-1375"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5541,25 +5679,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1376"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5569,19 +5707,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5591,13 +5729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5607,13 +5745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5623,14 +5761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5640,16 +5778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5659,13 +5797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1325"
+     "referenced_type" : "type-1377"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5675,13 +5813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1326"
+     "referenced_type" : "type-1378"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5691,14 +5829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5708,13 +5846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5724,13 +5862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1327"
+     "referenced_type" : "type-1379"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5740,14 +5878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5757,13 +5895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1328"
+     "referenced_type" : "type-1380"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5773,10 +5911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5786,10 +5924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5798,13 +5936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5814,10 +5952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5827,16 +5965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5845,14 +5983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-1268"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5861,14 +5999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5877,14 +6015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5894,16 +6032,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -5911,10 +6049,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1329"
+     "referenced_type" : "type-1381"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5925,13 +6063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1382"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5940,19 +6078,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1331"
+     "referenced_type" : "type-1383"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5963,10 +6101,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5976,13 +6114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5992,13 +6130,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6008,10 +6146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6021,10 +6159,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6034,10 +6172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6047,16 +6185,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6066,19 +6204,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1332"
+     "referenced_type" : "type-1384"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6088,13 +6226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1385"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6104,13 +6242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1334"
+     "referenced_type" : "type-1386"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6120,13 +6258,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6136,13 +6274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1335"
+     "referenced_type" : "type-1387"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6152,13 +6290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6168,10 +6306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6181,10 +6319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6194,13 +6332,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6210,13 +6348,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6226,19 +6364,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6247,22 +6385,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6272,10 +6410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6285,16 +6423,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6304,13 +6442,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6320,13 +6458,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6337,13 +6475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1340"
+     "referenced_type" : "type-1392"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6353,13 +6491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6369,13 +6507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6385,14 +6523,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6402,16 +6540,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6421,13 +6559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1396"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6437,13 +6575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1345"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6453,14 +6591,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6470,13 +6608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6486,13 +6624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6502,14 +6640,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6519,13 +6657,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6535,10 +6673,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6548,10 +6686,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6560,13 +6698,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6576,10 +6714,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6589,16 +6727,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6611,10 +6749,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6623,14 +6761,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6639,14 +6777,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6655,14 +6793,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6673,13 +6811,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1403"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6689,13 +6827,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6705,13 +6843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6721,16 +6859,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -6738,10 +6876,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1406"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6752,13 +6890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1407"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6767,19 +6905,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1408"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6790,10 +6928,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6803,13 +6941,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6819,13 +6957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6835,10 +6973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6848,10 +6986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6861,10 +6999,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6874,40 +7012,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1357"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6917,16 +7055,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6936,13 +7074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6952,13 +7090,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1411"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6968,13 +7106,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6984,13 +7122,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1412"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7000,7 +7138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
      "referenced_type" : "type-2"
@@ -7009,7 +7147,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7018,43 +7156,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1413"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7064,13 +7202,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7080,13 +7218,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1414"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7096,16 +7234,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-875"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7115,10 +7253,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7128,10 +7266,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7141,13 +7279,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7157,10 +7295,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7170,16 +7308,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7189,40 +7327,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7232,13 +7370,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7248,13 +7386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7264,16 +7402,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7281,10 +7419,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7295,13 +7433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7312,10 +7450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7325,13 +7463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7341,13 +7479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7357,10 +7495,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7370,10 +7508,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7383,10 +7521,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7396,16 +7534,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7415,19 +7553,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7437,13 +7575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1419"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7453,13 +7591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1420"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7469,13 +7607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7485,13 +7623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7501,13 +7639,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1370"
+     "referenced_type" : "type-1422"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7517,10 +7655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7530,10 +7668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7543,13 +7681,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7559,10 +7697,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7572,16 +7710,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7591,13 +7729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7607,13 +7745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7623,14 +7761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7640,16 +7778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7659,13 +7797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1423"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7675,13 +7813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1424"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7691,14 +7829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7708,13 +7846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7724,13 +7862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7740,14 +7878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7757,13 +7895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1426"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7773,10 +7911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7786,10 +7924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7798,13 +7936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7814,10 +7952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7827,16 +7965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7845,14 +7983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7861,14 +7999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7877,14 +8015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7895,13 +8033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7911,13 +8049,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7927,13 +8065,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7943,16 +8081,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7960,10 +8098,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7974,13 +8112,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1434"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7989,19 +8148,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8012,10 +8171,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8025,13 +8184,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8041,13 +8200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8057,10 +8216,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8070,10 +8229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8083,10 +8242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8096,16 +8255,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8115,13 +8274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8131,13 +8290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8147,13 +8306,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8163,13 +8322,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8179,19 +8338,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8201,13 +8382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8217,16 +8398,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8236,13 +8417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8252,10 +8433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8265,10 +8446,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1219"
+    },
+    {
+     "referenced_type" : "type-1194"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8277,16 +8482,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8296,10 +8501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8309,16 +8514,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8328,19 +8533,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8350,13 +8555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8366,33 +8571,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-210", "type-404" ]
+   "template_args" : [ "type-409", "type-215", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8400,18 +8647,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-404" ]
+   "template_args" : [ "type-409", "type-410", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8419,18 +8666,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-404" ]
+   "template_args" : [ "type-409", "type-5", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8438,18 +8685,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-190", "type-202" ]
+   "template_args" : [ "type-193", "type-195", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8457,18 +8704,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-189", "type-202" ]
+   "template_args" : [ "type-193", "type-194", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8476,18 +8723,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-5", "type-202" ]
+   "template_args" : [ "type-193", "type-5", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8495,18 +8742,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-133", "type-138" ]
+   "template_args" : [ "type-139", "type-140", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8514,18 +8761,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-5", "type-138" ]
+   "template_args" : [ "type-139", "type-5", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8533,18 +8780,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-413", "type-1121" ]
+   "template_args" : [ "type-461", "type-417", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8552,18 +8799,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-439", "type-1121" ]
+   "template_args" : [ "type-461", "type-444", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8571,18 +8818,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-5", "type-1121" ]
+   "template_args" : [ "type-461", "type-5", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8590,18 +8837,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-214", "type-602" ]
+   "template_args" : [ "type-623", "type-219", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8609,18 +8856,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-5", "type-602" ]
+   "template_args" : [ "type-623", "type-5", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8628,12 +8875,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
-   "return_type" : "type-208",
+   "return_type" : "type-213",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-210", "type-43" ]
+   "template_args" : [ "type-215", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8641,12 +8888,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-375",
+   "return_type" : "type-372",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-133", "type-43" ]
+   "template_args" : [ "type-140", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8654,12 +8901,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
-   "return_type" : "type-212",
+   "return_type" : "type-217",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-214", "type-43" ]
+   "template_args" : [ "type-219", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8667,18 +8914,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-404", "type-384", "type-43", "type-43" ]
+   "template_args" : [ "type-421", "type-409", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8686,18 +8933,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-188", "type-43", "type-43" ]
+   "template_args" : [ "type-207", "type-193", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8705,18 +8952,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-138", "type-132", "type-43", "type-43" ]
+   "template_args" : [ "type-143", "type-139", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8724,18 +8971,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1121", "type-462", "type-43", "type-43" ]
+   "template_args" : [ "type-1173", "type-461", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8743,18 +8990,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-602", "type-593", "type-43", "type-43" ]
+   "template_args" : [ "type-632", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8762,31 +9009,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8796,8 +9043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8805,8 +9052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8814,8 +9061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-922",
+   "referenced_type" : "type-44",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8823,8 +9070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-917",
+   "referenced_type" : "type-54",
+   "self_type" : "type-959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8832,8 +9079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8841,8 +9088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-584",
-   "self_type" : "type-589",
+   "referenced_type" : "type-603",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8850,8 +9097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8859,8 +9106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-241",
-   "self_type" : "type-247",
+   "referenced_type" : "type-246",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8868,8 +9115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8877,8 +9124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-617",
-   "self_type" : "type-621",
+   "referenced_type" : "type-648",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8886,8 +9133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-561",
-   "self_type" : "type-580",
+   "referenced_type" : "type-552",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8895,8 +9142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-627",
+   "referenced_type" : "type-629",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8904,8 +9151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-243",
-   "self_type" : "type-550",
+   "referenced_type" : "type-248",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8913,8 +9160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8922,8 +9169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8931,8 +9178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8940,8 +9187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8949,8 +9196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8958,8 +9205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-942",
-   "self_type" : "type-941",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8967,8 +9214,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-697",
+   "referenced_type" : "type-483",
+   "self_type" : "type-751",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8976,8 +9232,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-857",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8985,8 +9241,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-848",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8994,8 +9250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-683",
+   "referenced_type" : "type-104",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9003,8 +9259,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-701",
+   "referenced_type" : "type-486",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-123",
+   "self_type" : "type-614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9012,8 +9277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-902",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9021,8 +9286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-829",
-   "self_type" : "type-834",
+   "referenced_type" : "type-871",
+   "self_type" : "type-876",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9031,7 +9296,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-80",
-   "self_type" : "type-1132",
+   "self_type" : "type-1183",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9039,8 +9304,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-467",
-   "self_type" : "type-647",
+   "referenced_type" : "type-482",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9048,8 +9322,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-856",
-   "self_type" : "type-867",
+   "referenced_type" : "type-898",
+   "self_type" : "type-909",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9057,8 +9331,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-847",
-   "self_type" : "type-855",
+   "referenced_type" : "type-889",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9066,8 +9340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-645",
+   "referenced_type" : "type-103",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9075,8 +9349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-380",
+   "referenced_type" : "type-372",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9084,8 +9358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-220",
+   "referenced_type" : "type-213",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9093,8 +9367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-414",
+   "referenced_type" : "type-217",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9102,8 +9376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-460",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9111,8 +9385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9120,8 +9394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-239",
+   "referenced_type" : "type-191",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9129,8 +9403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-407",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9138,8 +9412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9147,8 +9421,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-490",
-   "self_type" : "type-501",
+   "referenced_type" : "type-496",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9156,8 +9430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9165,8 +9439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-913",
-   "self_type" : "type-916",
+   "referenced_type" : "type-955",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9174,8 +9448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-985",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9183,8 +9457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-609",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9192,8 +9466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-537",
+   "referenced_type" : "type-537",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9201,8 +9475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9210,8 +9484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-167",
+   "referenced_type" : "type-162",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9219,8 +9493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9228,8 +9502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-464",
-   "self_type" : "type-578",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9237,8 +9511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-151",
-   "self_type" : "type-153",
+   "referenced_type" : "type-156",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9246,8 +9520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9255,8 +9529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9264,8 +9538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9273,8 +9547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9282,17 +9556,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-574",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9300,8 +9583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-898",
+   "referenced_type" : "type-939",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9309,8 +9592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
+   "referenced_type" : "type-874",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9318,8 +9601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-828",
+   "referenced_type" : "type-868",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9327,8 +9610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9336,8 +9619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-503",
+   "referenced_type" : "type-480",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9345,8 +9628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9354,8 +9637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9363,8 +9646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9372,17 +9655,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1260",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1089",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9390,8 +9682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-502",
+   "referenced_type" : "type-504",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9399,8 +9691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-874",
+   "referenced_type" : "type-914",
+   "self_type" : "type-916",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9408,8 +9700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
+   "referenced_type" : "type-917",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9417,8 +9709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-892",
-   "self_type" : "type-894",
+   "referenced_type" : "type-934",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9426,8 +9718,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-968",
-   "self_type" : "type-969",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9435,8 +9727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9444,7 +9736,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9453,8 +9745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-401",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-405",
+   "self_type" : "type-1268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9462,8 +9754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-228",
-   "self_type" : "type-229",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9471,8 +9763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-207",
-   "self_type" : "type-211",
+   "referenced_type" : "type-212",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9480,8 +9772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-217",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9489,8 +9781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-445",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9498,8 +9790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-234",
-   "self_type" : "type-235",
+   "referenced_type" : "type-239",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9507,8 +9799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9516,8 +9808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9525,8 +9817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9534,8 +9826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-191",
+   "referenced_type" : "type-190",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9543,8 +9835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-386",
+   "referenced_type" : "type-406",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9552,8 +9844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-590",
-   "self_type" : "type-594",
+   "referenced_type" : "type-620",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9561,8 +9853,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-507",
-   "self_type" : "type-810",
+   "referenced_type" : "type-515",
+   "self_type" : "type-852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9570,8 +9862,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-862",
-   "self_type" : "type-878",
+   "referenced_type" : "type-904",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9579,8 +9871,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-1164",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9588,8 +9880,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-364",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-369",
+   "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9597,8 +9889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1184",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9606,8 +9898,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-1147",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9615,8 +9907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-296",
-   "self_type" : "type-802",
+   "referenced_type" : "type-297",
+   "self_type" : "type-844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9624,8 +9916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-819",
+   "referenced_type" : "type-860",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9633,8 +9925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-816",
-   "self_type" : "type-817",
+   "referenced_type" : "type-858",
+   "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9642,59 +9934,59 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-999",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1043",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
+   "referenced_type" : "type-661",
+   "self_type" : "type-663",
    "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-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-841",
+   "referenced_type" : "type-881",
+   "self_type" : "type-883",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-484",
+   "referenced_type" : "type-391",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9702,8 +9994,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
+   "referenced_type" : "type-854",
+   "self_type" : "type-855",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9711,8 +10003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-806",
-   "self_type" : "type-807",
+   "referenced_type" : "type-848",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9720,8 +10012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-803",
-   "self_type" : "type-805",
+   "referenced_type" : "type-845",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9729,8 +10021,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-1222",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9738,8 +10030,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-275",
-   "self_type" : "type-277",
+   "referenced_type" : "type-282",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9747,8 +10039,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-504",
-   "self_type" : "type-508",
+   "referenced_type" : "type-525",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9756,8 +10048,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-687",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9765,8 +10057,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-946",
-   "self_type" : "type-948",
+   "referenced_type" : "type-988",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9774,8 +10066,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9783,8 +10075,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9792,8 +10084,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-182",
+   "referenced_type" : "type-188",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9801,8 +10093,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-402",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9810,8 +10102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-705",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9819,8 +10111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9828,8 +10120,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-885",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-927",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9837,8 +10129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-811",
+   "referenced_type" : "type-37",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9846,8 +10138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-815",
+   "referenced_type" : "type-856",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9855,8 +10147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-808",
-   "self_type" : "type-809",
+   "referenced_type" : "type-850",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9864,8 +10156,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-41",
-   "self_type" : "type-909",
+   "referenced_type" : "type-27",
+   "self_type" : "type-951",
    "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"
   },
@@ -9874,7 +10166,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1047",
+   "self_type" : "type-1098",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -9883,7 +10175,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1060",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -9894,8 +10186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -9903,8 +10195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1076",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9912,8 +10204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9921,8 +10213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9930,8 +10222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9939,8 +10231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9949,7 +10241,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-824",
+   "self_type" : "type-866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9957,8 +10249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9966,8 +10258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-250",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9975,8 +10267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9984,8 +10276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9993,8 +10285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10020,8 +10312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-821",
+   "referenced_type" : "type-862",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10029,8 +10321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10038,8 +10330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-923",
+   "referenced_type" : "type-44",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10047,8 +10339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-918",
+   "referenced_type" : "type-54",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10056,8 +10348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-296",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10065,8 +10357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-657",
+   "referenced_type" : "type-643",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10074,8 +10366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-510",
+   "referenced_type" : "type-200",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10083,8 +10375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10092,8 +10384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10101,8 +10393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-272",
+   "referenced_type" : "type-210",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10110,8 +10402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-498",
+   "referenced_type" : "type-424",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10119,17 +10411,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-651",
+   "referenced_type" : "type-635",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-991",
+   "self_type" : "type-1034",
+   "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-999",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-962",
-   "self_type" : "type-967",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10137,8 +10447,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-981",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10146,8 +10456,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-970",
-   "self_type" : "type-976",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10155,8 +10465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10164,8 +10474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10182,8 +10492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10191,8 +10501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-938",
+   "referenced_type" : "type-975",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10200,8 +10510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10209,8 +10519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10218,8 +10528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "type-603",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10227,8 +10537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10236,8 +10546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-245",
+   "referenced_type" : "type-246",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10245,8 +10555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10254,8 +10564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-618",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10263,8 +10573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-561",
-   "self_type" : "type-575",
+   "referenced_type" : "type-552",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10272,8 +10582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-624",
+   "referenced_type" : "type-629",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10281,17 +10591,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-523",
+   "referenced_type" : "type-248",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1032",
+   "self_type" : "type-1035",
+   "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-1036",
+   "self_type" : "type-1038",
+   "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-1039",
+   "self_type" : "type-1040",
+   "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-146",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-151",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10299,8 +10636,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-696",
+   "referenced_type" : "type-483",
+   "self_type" : "type-750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10308,8 +10654,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-857",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1185",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10317,8 +10663,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-848",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10326,8 +10672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-672",
+   "referenced_type" : "type-104",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10335,8 +10681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-606",
+   "referenced_type" : "type-247",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10344,8 +10690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1157",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10353,8 +10699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1097",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1150",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10362,8 +10708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-352",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10371,8 +10717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-338",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10380,8 +10726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
+   "referenced_type" : "type-338",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10389,8 +10735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10398,8 +10744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-376",
+   "referenced_type" : "type-140",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10407,8 +10753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-226",
+   "referenced_type" : "type-195",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10416,8 +10762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-215",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10425,8 +10771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-219",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10434,8 +10780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10443,8 +10789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10452,8 +10798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10461,8 +10807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10470,8 +10816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10479,8 +10825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-355",
+   "referenced_type" : "type-359",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10488,8 +10834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-563",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10498,7 +10844,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-74",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10533,8 +10879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10542,8 +10888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-232",
+   "referenced_type" : "type-194",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10551,8 +10897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-418",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10560,8 +10906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-986",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10569,8 +10915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10578,8 +10924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-197",
+   "referenced_type" : "type-197",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10587,8 +10933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-399",
+   "referenced_type" : "type-414",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10596,8 +10942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10605,8 +10951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10614,8 +10960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10623,8 +10969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-206",
+   "referenced_type" : "type-207",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10632,8 +10978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-404",
-   "self_type" : "type-409",
+   "referenced_type" : "type-421",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10641,8 +10987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "type-632",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10650,8 +10996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10659,8 +11005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10668,8 +11014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-201",
+   "referenced_type" : "type-203",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10677,8 +11023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10686,8 +11032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-601",
+   "referenced_type" : "type-630",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10695,8 +11041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10704,8 +11050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-139",
+   "self_type" : "type-1207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10713,8 +11059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "type-193",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10722,8 +11068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10731,17 +11077,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-123",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10749,8 +11104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10758,8 +11113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-491",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10767,8 +11122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-501",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10776,8 +11131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "referenced_type" : "type-871",
+   "self_type" : "type-872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10786,7 +11141,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-80",
-   "self_type" : "type-850",
+   "self_type" : "type-892",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10794,8 +11149,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-646",
+   "referenced_type" : "type-482",
+   "self_type" : "type-671",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10803,8 +11167,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-856",
-   "self_type" : "type-864",
+   "referenced_type" : "type-898",
+   "self_type" : "type-906",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10812,8 +11176,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-847",
-   "self_type" : "type-852",
+   "referenced_type" : "type-889",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10821,8 +11185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-370",
+   "referenced_type" : "type-103",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10830,8 +11194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-891",
+   "referenced_type" : "type-932",
+   "self_type" : "type-933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10839,8 +11203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-945",
+   "referenced_type" : "type-198",
+   "self_type" : "type-987",
    "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"
   },
@@ -10857,8 +11221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10866,8 +11230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10884,8 +11248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-29",
+   "referenced_type" : "type-16",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10893,8 +11257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-260",
+   "referenced_type" : "type-24",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10902,8 +11266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-416",
+   "referenced_type" : "type-415",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10911,8 +11275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10920,8 +11284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
+   "referenced_type" : "type-230",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10929,8 +11293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-219",
+   "referenced_type" : "type-213",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10938,8 +11302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10947,8 +11311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-440",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10956,8 +11320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10965,8 +11329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10974,8 +11338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10983,8 +11347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10992,8 +11356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-237",
+   "referenced_type" : "type-191",
+   "self_type" : "type-242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11001,8 +11365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-407",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11010,8 +11374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11019,8 +11383,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-490",
-   "self_type" : "type-489",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11028,8 +11392,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-194",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11037,8 +11401,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-265",
-   "self_type" : "type-278",
+   "referenced_type" : "type-268",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11046,8 +11410,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-352",
-   "self_type" : "type-363",
+   "referenced_type" : "type-335",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11055,8 +11419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-975",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11064,8 +11428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-625",
+   "referenced_type" : "type-528",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11073,8 +11437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-827",
+   "referenced_type" : "type-499",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11083,7 +11447,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1144",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11091,8 +11455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11100,8 +11464,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11109,8 +11473,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-609",
+   "referenced_type" : "type-57",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11118,8 +11482,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-905",
+   "referenced_type" : "type-946",
+   "self_type" : "type-947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11127,8 +11491,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-864",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11136,8 +11500,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-921",
+   "referenced_type" : "type-43",
+   "self_type" : "type-963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11145,8 +11509,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-915",
+   "referenced_type" : "type-955",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11154,8 +11518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11163,8 +11527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-925",
-   "self_type" : "type-926",
+   "referenced_type" : "type-967",
+   "self_type" : "type-968",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11172,8 +11536,8 @@
    "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-955",
-   "self_type" : "type-956",
+   "referenced_type" : "type-997",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11181,8 +11545,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-961",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1003",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11190,8 +11554,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11199,8 +11563,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11208,8 +11572,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11217,8 +11581,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-249",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11226,8 +11590,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11235,8 +11599,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-656",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11244,8 +11608,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-584",
+   "self_type" : "type-599",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11253,8 +11617,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-558",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11262,8 +11626,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-699",
+   "referenced_type" : "type-752",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11271,8 +11635,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11280,8 +11644,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-181",
+   "referenced_type" : "type-181",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11289,8 +11653,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
+   "referenced_type" : "type-125",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11298,8 +11662,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-175",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11307,8 +11671,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-171",
+   "referenced_type" : "type-175",
+   "self_type" : "type-176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11316,8 +11689,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11325,8 +11698,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-1129",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1182",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11334,8 +11707,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11343,8 +11716,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11352,8 +11725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11361,8 +11734,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-614",
+   "referenced_type" : "type-619",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11370,8 +11743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11379,8 +11752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11388,8 +11761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "referenced_type" : "type-357",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11397,8 +11770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11406,8 +11779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-336",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11415,8 +11788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11424,8 +11797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11433,8 +11806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-317",
+   "referenced_type" : "type-321",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11442,8 +11815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-223",
-   "self_type" : "type-224",
+   "referenced_type" : "type-228",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11451,8 +11824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-319",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11460,8 +11833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11469,8 +11842,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11478,8 +11851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11487,8 +11860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11496,8 +11869,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "type-590",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11505,8 +11878,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11514,8 +11887,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-323",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11523,8 +11896,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11532,8 +11905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11541,8 +11914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-150",
+   "referenced_type" : "type-142",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11550,8 +11923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11559,8 +11932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-569",
-   "self_type" : "type-570",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11568,8 +11941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-746",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11577,8 +11950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11586,8 +11959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-134",
+   "referenced_type" : "type-138",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11595,8 +11968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
+   "referenced_type" : "type-333",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11604,8 +11977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11613,17 +11986,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-692",
+   "referenced_type" : "type-743",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11631,8 +12013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11640,8 +12022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-836",
+   "referenced_type" : "type-874",
+   "self_type" : "type-878",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11649,8 +12031,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11658,8 +12040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-466",
+   "referenced_type" : "type-480",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11667,8 +12049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11676,8 +12058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11685,8 +12067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11694,8 +12076,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11703,8 +12094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11712,8 +12103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-914",
+   "self_type" : "type-915",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11721,8 +12112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-876",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11730,8 +12121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-892",
-   "self_type" : "type-893",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11739,8 +12130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1147",
    "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"
   },
@@ -11748,8 +12139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11757,8 +12148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-288",
+   "referenced_type" : "type-290",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11766,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1093",
    "size" : 4,
    "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"
   },
@@ -11775,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-49",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11784,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-264",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11793,7 +12184,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -11802,8 +12193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11811,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11820,8 +12211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-222",
+   "referenced_type" : "type-212",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11829,8 +12220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-218",
+   "referenced_type" : "type-221",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11838,8 +12229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-451",
+   "referenced_type" : "type-453",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11847,8 +12238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-236",
+   "referenced_type" : "type-239",
+   "self_type" : "type-241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11856,8 +12247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11865,8 +12256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11874,8 +12265,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11883,8 +12274,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-240",
+   "referenced_type" : "type-190",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11892,8 +12283,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-427",
+   "referenced_type" : "type-406",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11901,8 +12292,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-590",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11910,8 +12301,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-507",
-   "self_type" : "type-506",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11919,8 +12310,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-862",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11928,8 +12319,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-1164",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11937,8 +12328,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-283",
-   "self_type" : "type-286",
+   "referenced_type" : "type-281",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11946,8 +12337,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-364",
-   "self_type" : "type-371",
+   "referenced_type" : "type-369",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11955,8 +12346,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11964,8 +12355,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-838",
-   "self_type" : "type-851",
+   "referenced_type" : "type-880",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11973,8 +12364,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-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11982,8 +12373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11991,8 +12382,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12000,7 +12391,7 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-391",
    "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -12009,8 +12400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12018,8 +12409,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12027,8 +12418,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-814",
-   "self_type" : "type-939",
+   "referenced_type" : "type-856",
+   "self_type" : "type-981",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12036,8 +12427,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-896",
+   "referenced_type" : "type-937",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12045,8 +12436,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12054,8 +12445,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-871",
+   "referenced_type" : "type-27",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12063,8 +12454,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-582",
+   "referenced_type" : "type-392",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12072,8 +12463,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-644",
+   "referenced_type" : "type-170",
+   "self_type" : "type-654",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12082,7 +12473,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-90",
-   "self_type" : "type-104",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12091,7 +12482,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1221",
+   "self_type" : "type-1273",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12100,7 +12491,7 @@
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
    "referenced_type" : "type-83",
-   "self_type" : "type-935",
+   "self_type" : "type-977",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12108,8 +12499,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12117,8 +12508,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12126,8 +12517,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-42",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12139,8 +12530,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12149,8 +12540,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-250",
-   "self_type" : "type-252",
+   "referenced_type" : "type-255",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12159,8 +12550,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-441",
-   "self_type" : "type-443",
+   "referenced_type" : "type-456",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12169,8 +12560,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
+   "referenced_type" : "type-658",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12179,8 +12570,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-714",
-   "self_type" : "type-716",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12199,8 +12590,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-144",
+   "referenced_type" : "type-17",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12209,8 +12600,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-643",
-   "self_type" : "type-904",
+   "referenced_type" : "type-653",
+   "self_type" : "type-946",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12220,7 +12611,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-822",
+   "self_type" : "type-864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12229,8 +12620,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12239,8 +12630,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-913",
+   "referenced_type" : "type-54",
+   "self_type" : "type-955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12249,8 +12640,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-50",
-   "self_type" : "type-990",
+   "referenced_type" : "type-36",
+   "self_type" : "type-1041",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12259,8 +12650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-143",
-   "self_type" : "type-925",
+   "referenced_type" : "type-148",
+   "self_type" : "type-967",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12269,8 +12660,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-949",
-   "self_type" : "type-955",
+   "referenced_type" : "type-991",
+   "self_type" : "type-997",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12279,8 +12670,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-957",
-   "self_type" : "type-960",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1002",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12289,8 +12680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-933",
-   "self_type" : "type-943",
+   "referenced_type" : "type-975",
+   "self_type" : "type-985",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12299,8 +12690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1231",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12309,8 +12700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-584",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-607",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12319,8 +12710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1237",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12329,8 +12720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-241",
-   "self_type" : "type-248",
+   "referenced_type" : "type-246",
+   "self_type" : "type-253",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12339,8 +12730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12349,8 +12740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-617",
-   "self_type" : "type-622",
+   "referenced_type" : "type-648",
+   "self_type" : "type-656",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12359,8 +12750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-581",
+   "referenced_type" : "type-552",
+   "self_type" : "type-584",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12369,8 +12760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-526",
+   "referenced_type" : "type-248",
+   "self_type" : "type-537",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12379,8 +12770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-952",
-   "self_type" : "type-954",
+   "referenced_type" : "type-994",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12389,8 +12780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-698",
+   "referenced_type" : "type-483",
+   "self_type" : "type-752",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12399,8 +12790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12409,8 +12800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12420,7 +12811,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-135",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12430,7 +12821,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-76",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12440,7 +12831,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12449,8 +12850,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-857",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1187",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12459,8 +12860,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-848",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12469,8 +12870,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12479,8 +12880,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-869",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-911",
+   "self_type" : "type-1062",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12489,8 +12890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-104",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12499,8 +12900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-242",
-   "self_type" : "type-610",
+   "referenced_type" : "type-247",
+   "self_type" : "type-619",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12509,8 +12910,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1162",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12519,8 +12920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1154",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12529,8 +12930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-354",
+   "self_type" : "type-357",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12539,8 +12940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-350",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12549,8 +12950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-343",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12559,8 +12960,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1118",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12569,8 +12970,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12579,8 +12980,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12589,8 +12990,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-417",
+   "self_type" : "type-1134",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12599,8 +13000,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-408",
+   "referenced_type" : "type-140",
+   "self_type" : "type-411",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12609,8 +13010,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-316",
+   "referenced_type" : "type-195",
+   "self_type" : "type-321",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12619,8 +13020,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-223",
+   "referenced_type" : "type-215",
+   "self_type" : "type-228",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12629,8 +13030,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-314",
+   "referenced_type" : "type-219",
+   "self_type" : "type-319",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12639,8 +13040,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12649,8 +13050,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-703",
+   "referenced_type" : "type-486",
+   "self_type" : "type-756",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12659,8 +13060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-487",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12669,8 +13070,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12679,8 +13080,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-464",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12689,8 +13090,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12699,8 +13100,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-157",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12709,8 +13110,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12719,8 +13120,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12729,8 +13130,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-185",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12739,8 +13140,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1169",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -12749,8 +13150,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-359",
+   "referenced_type" : "type-361",
+   "self_type" : "type-365",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -12759,8 +13160,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-567",
+   "referenced_type" : "type-587",
+   "self_type" : "type-590",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -12770,7 +13171,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-88",
-   "self_type" : "type-112",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12780,7 +13181,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-79",
-   "self_type" : "type-173",
+   "self_type" : "type-178",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12790,7 +13191,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-96",
-   "self_type" : "type-169",
+   "self_type" : "type-174",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12800,7 +13201,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-89",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12810,7 +13211,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-97",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12819,8 +13220,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-444",
+   "self_type" : "type-1136",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -12829,8 +13230,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-318",
+   "referenced_type" : "type-194",
+   "self_type" : "type-323",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -12839,8 +13240,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-549",
+   "referenced_type" : "type-410",
+   "self_type" : "type-570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -12850,7 +13251,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12859,8 +13260,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-573",
+   "referenced_type" : "type-102",
+   "self_type" : "type-597",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12869,8 +13270,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12879,8 +13280,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -12889,8 +13290,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-142",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12899,8 +13300,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-361",
+   "referenced_type" : "type-207",
+   "self_type" : "type-367",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -12909,8 +13310,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-569",
+   "referenced_type" : "type-421",
+   "self_type" : "type-593",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12919,8 +13320,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-694",
+   "referenced_type" : "type-632",
+   "self_type" : "type-746",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -12930,7 +13331,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -12939,8 +13340,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-461",
+   "self_type" : "type-1138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -12949,8 +13350,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-139",
+   "self_type" : "type-138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -12959,8 +13360,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-328",
+   "referenced_type" : "type-193",
+   "self_type" : "type-333",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -12969,8 +13370,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-409",
+   "self_type" : "type-581",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -12979,18 +13380,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-690",
+   "referenced_type" : "type-623",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-119",
-   "self_type" : "type-122",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13000,7 +13421,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13009,8 +13430,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1177",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13019,8 +13440,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-501",
+   "self_type" : "type-1200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13029,8 +13450,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-897",
+   "referenced_type" : "type-165",
+   "self_type" : "type-939",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13039,8 +13460,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-832",
+   "referenced_type" : "type-871",
+   "self_type" : "type-874",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13050,7 +13471,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-80",
-   "self_type" : "type-826",
+   "self_type" : "type-868",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13059,8 +13480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-571",
+   "referenced_type" : "type-482",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13069,8 +13490,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-465",
+   "referenced_type" : "type-473",
+   "self_type" : "type-480",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13079,8 +13500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13090,7 +13511,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-84",
-   "self_type" : "type-1203",
+   "self_type" : "type-1254",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13100,7 +13521,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-75",
-   "self_type" : "type-1209",
+   "self_type" : "type-1261",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13110,7 +13531,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-92",
-   "self_type" : "type-1206",
+   "self_type" : "type-1257",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13119,8 +13550,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-847",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-889",
+   "self_type" : "type-1140",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13129,8 +13560,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13139,8 +13570,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-872",
+   "referenced_type" : "type-910",
+   "self_type" : "type-914",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13149,8 +13580,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-875",
+   "referenced_type" : "type-103",
+   "self_type" : "type-917",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13159,8 +13590,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13169,8 +13600,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-1092",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1146",
    "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"
   },
@@ -13179,8 +13610,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-907",
-   "self_type" : "type-908",
+   "referenced_type" : "type-949",
+   "self_type" : "type-950",
    "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"
   },
@@ -13190,7 +13621,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-966",
+   "self_type" : "type-1008",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13199,8 +13630,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-965",
-   "self_type" : "type-968",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1010",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13209,8 +13640,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-267",
-   "self_type" : "type-287",
+   "referenced_type" : "type-270",
+   "self_type" : "type-290",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13219,8 +13650,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-1044",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1099",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13229,8 +13660,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-1043",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1097",
    "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"
   },
@@ -13239,8 +13670,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-354",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-337",
+   "self_type" : "type-1092",
    "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"
   },
@@ -13249,8 +13680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13259,8 +13690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13269,8 +13700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-420",
+   "referenced_type" : "type-415",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13279,8 +13710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-401",
+   "referenced_type" : "type-372",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13289,8 +13720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13299,8 +13730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "type-213",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13309,8 +13740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-217",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13319,8 +13750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-444",
+   "referenced_type" : "type-442",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13329,8 +13760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-231",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13339,8 +13770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13349,8 +13780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-486",
+   "referenced_type" : "type-459",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13359,8 +13790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13369,8 +13800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "type-191",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13379,8 +13810,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13389,8 +13820,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13399,8 +13830,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-490",
-   "self_type" : "type-507",
+   "referenced_type" : "type-496",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13409,8 +13840,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-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-905",
+   "self_type" : "type-904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13419,8 +13850,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-194",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13429,8 +13860,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-265",
-   "self_type" : "type-283",
+   "referenced_type" : "type-268",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13439,8 +13870,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-352",
-   "self_type" : "type-364",
+   "referenced_type" : "type-335",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13449,8 +13880,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13459,8 +13890,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-493",
-   "self_type" : "type-838",
+   "referenced_type" : "type-499",
+   "self_type" : "type-880",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13470,7 +13901,7 @@
    "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-3",
-   "self_type" : "type-1147",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13479,8 +13910,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-296",
+   "referenced_type" : "type-39",
+   "self_type" : "type-297",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13489,8 +13920,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13499,8 +13930,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13510,7 +13941,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-91",
-   "self_type" : "type-818",
+   "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13519,8 +13950,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-792",
-   "self_type" : "type-816",
+   "referenced_type" : "type-834",
+   "self_type" : "type-858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13529,8 +13960,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-999",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13538,48 +13969,48 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "source_file" : "/system/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-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13587,8 +14018,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13597,8 +14028,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-812",
+   "referenced_type" : "type-32",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13607,8 +14038,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13617,8 +14048,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-806",
+   "referenced_type" : "type-730",
+   "self_type" : "type-848",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13627,8 +14058,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13637,8 +14068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13647,8 +14078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13657,8 +14088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-560",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13667,8 +14098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13677,8 +14108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13687,8 +14118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13697,8 +14128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13707,8 +14138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13717,8 +14148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13727,8 +14158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13737,8 +14168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13747,8 +14178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13757,8 +14188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13767,8 +14198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-312",
+   "self_type" : "type-311",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13777,8 +14208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13787,8 +14218,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13797,8 +14228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13807,8 +14238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13817,8 +14248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13827,8 +14258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13837,8 +14268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13847,8 +14278,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13857,8 +14288,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13867,8 +14298,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-742",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13877,8 +14308,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13887,8 +14318,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13897,8 +14328,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13907,8 +14338,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13917,8 +14348,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13927,8 +14358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13937,8 +14368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13947,8 +14378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13957,8 +14388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13967,8 +14398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13977,8 +14408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13987,8 +14418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13997,8 +14428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14007,8 +14438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14017,8 +14448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14027,8 +14458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "type-61",
+   "self_type" : "type-60",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14037,8 +14468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14047,8 +14478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14057,8 +14488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14067,8 +14498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14077,8 +14508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-562",
+   "self_type" : "type-561",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14087,8 +14518,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14107,8 +14548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14117,8 +14558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14127,8 +14568,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14147,8 +14598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14157,8 +14608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-545",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14167,8 +14618,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14187,8 +14648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-332",
+   "self_type" : "type-331",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14197,8 +14658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14207,8 +14668,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14217,38 +14688,88 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-137",
+   "self_type" : "type-136",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-130",
    "self_type" : "type-129",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14257,8 +14778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14267,8 +14788,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14277,8 +14808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14287,8 +14818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14297,8 +14828,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14307,8 +14848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1265",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14317,8 +14858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14327,8 +14868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14337,8 +14878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-680",
+   "self_type" : "type-679",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14347,8 +14888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14357,8 +14898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14367,8 +14908,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-1052",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14377,8 +14918,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-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14387,8 +14928,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-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14397,8 +14938,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-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14407,8 +14948,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-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-707",
+   "self_type" : "type-706",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14417,8 +14958,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-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14427,8 +14968,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-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14437,8 +14978,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-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14447,8 +14988,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-520",
-   "self_type" : "type-519",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14457,8 +14998,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-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-705",
+   "self_type" : "type-704",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14467,8 +15008,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-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14477,8 +15018,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-276",
-   "self_type" : "type-275",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14487,8 +15028,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-505",
-   "self_type" : "type-504",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14497,8 +15038,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-688",
+   "self_type" : "type-687",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14507,8 +15048,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-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14517,8 +15058,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-1197",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14527,8 +15068,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-259",
-   "self_type" : "type-258",
+   "referenced_type" : "type-265",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14537,8 +15078,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-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14547,8 +15088,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-640",
-   "self_type" : "type-639",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14557,8 +15098,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-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14567,8 +15108,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-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14577,8 +15118,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-262",
+   "self_type" : "type-261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14587,8 +15128,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14597,8 +15138,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-638",
-   "self_type" : "type-637",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14607,8 +15148,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-854",
-   "self_type" : "type-853",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14617,8 +15158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14627,8 +15168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14637,8 +15178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14647,8 +15188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14657,8 +15198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14667,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14678,7 +15219,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-90",
-   "self_type" : "type-885",
+   "self_type" : "type-927",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14688,7 +15229,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-51",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14698,7 +15239,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-83",
-   "self_type" : "type-814",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14707,8 +15248,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-808",
+   "referenced_type" : "type-396",
+   "self_type" : "type-850",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14716,8 +15257,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-895",
+   "referenced_type" : "type-29",
+   "self_type" : "type-937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -14725,8 +15266,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-39",
+   "self_type" : "type-300",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -14735,8 +15276,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-58",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -14750,14 +15291,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -14769,17 +15310,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-51"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-44", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -14789,37 +15330,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
+     "referenced_type" : "type-652"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
+   "name" : "android::LightRefBase<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-653" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
      "referenced_type" : "type-642"
     }
    ],
-   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
-   "name" : "android::LightRefBase<android::NativeHandle>",
+   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
+   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
    "referenced_type" : "type-641",
    "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "template_args" : [ "type-643" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-633" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -14829,14 +15370,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-34"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -14848,14 +15389,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1026"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -14865,7 +15406,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-651"
     }
    ],
    "fields" :
@@ -14874,20 +15415,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -14899,14 +15440,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1083"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -14918,14 +15459,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -14937,14 +15478,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -15015,8 +15556,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -15026,8 +15567,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -15059,8 +15600,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -15071,17 +15612,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-52"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -15128,14 +15669,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -15193,14 +15734,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-45"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -15212,14 +15753,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -15239,62 +15780,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-297"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -15384,17 +15925,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -15441,7 +15982,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
@@ -15453,20 +15994,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -15518,14 +16059,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-641"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-643",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -15553,7 +16094,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -15562,32 +16103,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -15703,7 +16244,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     },
     {
      "access" : "private",
@@ -15715,14 +16256,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -15810,23 +16351,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -15999,23 +16540,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -16200,23 +16741,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -16393,23 +16934,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -16686,23 +17227,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -16879,23 +17420,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17068,23 +17609,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17261,23 +17802,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -17594,23 +18135,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-932",
-   "self_type" : "type-932",
+   "referenced_type" : "type-974",
+   "self_type" : "type-974",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17783,23 +18324,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17988,23 +18529,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18185,23 +18726,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18438,6 +18979,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -18546,23 +19091,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-635",
+   "self_type" : "type-635",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18635,6 +19180,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -18746,17 +19295,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -18926,23 +19475,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-950"
+     "referenced_type" : "type-992"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-993"
     }
    ],
    "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-949",
-   "self_type" : "type-949",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-952" ],
+   "template_args" : [ "type-3", "type-994" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -18952,23 +19501,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-958"
+     "referenced_type" : "type-1000"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-1001"
     }
    ],
    "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-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-39" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -18978,23 +19527,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-1005"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-964"
+     "referenced_type" : "type-1006"
     }
    ],
    "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-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1004",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-965", "type-889" ],
+   "template_args" : [ "type-1007", "type-931" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19004,23 +19553,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-982"
+     "referenced_type" : "type-1024"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1025"
     }
    ],
    "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-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-984", "type-985" ],
+   "template_args" : [ "type-1026", "type-1027" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19030,23 +19579,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-1013"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-1014"
     }
    ],
    "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-970",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-973", "type-974" ],
+   "template_args" : [ "type-1015", "type-1016" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19075,8 +19624,8 @@
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -19087,7 +19636,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-829"
+     "referenced_type" : "type-871"
     },
     {
      "is_virtual" : true,
@@ -19097,8 +19646,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-879",
+   "self_type" : "type-879",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19185,8 +19734,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -19390,8 +19939,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -19473,13 +20022,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-842"
+     "referenced_type" : "type-884"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-943"
     },
     {
      "access" : "private",
@@ -19496,11 +20045,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-942",
+   "self_type" : "type-942",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19516,19 +20065,19 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-976"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
@@ -19552,7 +20101,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-977"
     },
     {
      "access" : "private",
@@ -19582,38 +20131,38 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 448,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 456,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 464,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-978"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -19640,8 +20189,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-940",
-   "self_type" : "type-940",
+   "referenced_type" : "type-982",
+   "self_type" : "type-982",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -19661,25 +20210,25 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
@@ -19697,86 +20246,86 @@
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-35"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 480,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-40"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-54"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 768,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 776,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -19854,7 +20403,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -19864,8 +20413,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -19875,7 +20424,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19884,17 +20433,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1104" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -19902,7 +20451,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19911,17 +20460,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-460" ],
+   "template_args" : [ "type-459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -19929,7 +20478,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19938,17 +20487,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1155" ],
+   "template_args" : [ "type-1206" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -19956,7 +20505,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19965,17 +20514,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-186" ],
+   "template_args" : [ "type-191" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -19983,7 +20532,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19992,17 +20541,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-407" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -20010,7 +20559,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -20019,17 +20568,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-591" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -20037,7 +20586,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -20046,17 +20595,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20064,17 +20613,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20084,26 +20633,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -20113,34 +20662,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1032",
+   "self_type" : "type-1032",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-991" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1036",
+   "self_type" : "type-1036",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-999" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1039",
+   "self_type" : "type-1039",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1004" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20169,18 +20778,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20192,14 +20801,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20208,8 +20817,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20218,8 +20827,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20228,8 +20837,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20249,8 +20858,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-86",
    "self_type" : "type-86",
@@ -20265,7 +20874,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
@@ -20273,11 +20882,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -20289,7 +20898,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "_pad",
@@ -20297,11 +20906,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-886",
+   "self_type" : "type-886",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -20313,7 +20922,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -20321,11 +20930,35 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-485"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-83"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -20337,7 +20970,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
@@ -20345,11 +20978,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -20369,8 +21002,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-77",
    "self_type" : "type-77",
@@ -20385,7 +21018,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "_pad",
@@ -20393,11 +21026,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -20409,7 +21042,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     },
     {
      "field_name" : "_pad",
@@ -20417,11 +21050,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -20441,8 +21074,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-94",
    "self_type" : "type-94",
@@ -20456,16 +21089,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -20474,16 +21107,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -20492,16 +21125,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -20510,16 +21143,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -20528,16 +21161,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -20600,13 +21233,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-74" ],
@@ -20618,16 +21251,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-858"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-900"
     }
    ],
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-899",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -20636,13 +21287,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-891"
     }
    ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-890",
+   "self_type" : "type-890",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-80" ],
@@ -20654,16 +21305,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -20672,16 +21323,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-923"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20691,7 +21342,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-609"
+     "referenced_type" : "type-615"
     },
     {
      "field_name" : "_pad",
@@ -20699,11 +21350,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-923",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20723,7 +21374,7 @@
    "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20733,7 +21384,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
      "field_name" : "_pad",
@@ -20741,8 +21392,8 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-82",
    "self_type" : "type-82",
@@ -20756,16 +21407,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20775,7 +21426,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "_pad",
@@ -20783,11 +21434,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20799,7 +21450,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-901"
     },
     {
      "field_name" : "_pad",
@@ -20807,11 +21458,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -20823,7 +21474,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-850"
+     "referenced_type" : "type-892"
     },
     {
      "field_name" : "_pad",
@@ -20831,11 +21482,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20847,7 +21498,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
@@ -20855,11 +21506,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -20870,16 +21521,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-912"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -20889,7 +21540,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-871"
+     "referenced_type" : "type-913"
     },
     {
      "field_name" : "_pad",
@@ -20897,11 +21548,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-912",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20912,16 +21563,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-943",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -20931,7 +21582,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "field_name" : "_pad",
@@ -20939,11 +21590,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20954,13 +21605,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-90" ],
@@ -20973,7 +21624,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "_pad",
@@ -20981,11 +21632,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -20994,8 +21645,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -21007,20 +21658,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -21029,8 +21680,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-924",
+   "self_type" : "type-924",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -21040,8 +21691,8 @@
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-925",
+   "self_type" : "type-925",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -21052,7 +21703,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21061,13 +21712,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -21189,7 +21840,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21198,13 +21849,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1097",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -21326,7 +21977,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21335,13 +21986,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -21463,7 +22114,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21472,13 +22123,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -21600,7 +22251,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21609,13 +22260,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -21737,10 +22388,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-971"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -21749,19 +22400,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1108"
+     "referenced_type" : "type-1159"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1109"
+     "referenced_type" : "type-1160"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -21950,10 +22601,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-970"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -21962,19 +22613,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1152"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1153"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -22172,10 +22823,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22184,19 +22835,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -22388,10 +23039,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22400,19 +23051,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -22679,10 +23330,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22691,19 +23342,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-341"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -22896,23 +23547,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-164"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-160"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -22927,8 +23578,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -23050,8 +23701,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -23185,8 +23836,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -23312,8 +23963,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -23539,8 +24190,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -23662,18 +24313,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -23694,8 +24345,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -23716,8 +24367,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -23728,13 +24379,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -23760,8 +24411,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -23782,8 +24433,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -23793,7 +24444,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23802,13 +24453,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -23930,7 +24581,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23939,13 +24590,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -24067,7 +24718,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -24076,13 +24727,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -24204,10 +24855,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24216,19 +24867,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1115"
+     "referenced_type" : "type-1167"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1116"
+     "referenced_type" : "type-1168"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -24417,10 +25068,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24429,19 +25080,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -24633,10 +25284,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24645,19 +25296,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -24982,7 +25633,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -25046,7 +25697,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -25072,13 +25723,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -25195,13 +25846,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -25322,13 +25973,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -25590,13 +26241,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -25606,7 +26257,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25615,13 +26266,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1028",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -25743,7 +26394,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25752,13 +26403,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -25880,7 +26531,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25889,13 +26540,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -26017,7 +26668,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26026,13 +26677,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -26154,7 +26805,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26163,13 +26814,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -26291,10 +26942,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26303,19 +26954,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1122"
+     "referenced_type" : "type-1174"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1123"
+     "referenced_type" : "type-1175"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -26504,10 +27155,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26516,19 +27167,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -26729,10 +27380,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26741,19 +27392,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-208"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -26948,10 +27599,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26960,19 +27611,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-422"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -27166,6 +27817,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -27290,10 +27944,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27302,19 +27956,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-603"
+     "referenced_type" : "type-633"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -27385,6 +28039,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -27509,10 +28166,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27521,19 +28178,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1220",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -27664,10 +28321,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27676,19 +28333,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -27831,10 +28488,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27843,19 +28500,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -27992,10 +28649,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28004,19 +28661,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -28210,6 +28867,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -28276,10 +28936,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28288,19 +28948,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -28371,6 +29031,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -28437,13 +29100,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -28560,13 +29223,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -28699,13 +29362,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -28830,13 +29493,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -29075,6 +29738,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29125,13 +29792,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -29206,6 +29873,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29252,19 +29923,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-103"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-122"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -29277,13 +29970,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-903"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-902",
+   "self_type" : "type-902",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -29303,7 +29996,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
@@ -29320,8 +30013,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -29406,8 +30099,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -29489,19 +30182,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -29513,7 +30206,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "access" : "private",
@@ -29530,8 +30223,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-871",
+   "self_type" : "type-871",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -29555,7 +30248,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -29573,7 +30266,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-885"
     },
     {
      "access" : "private",
@@ -29585,16 +30278,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-884",
+   "self_type" : "type-884",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -29604,7 +30297,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-483"
     },
     {
      "access" : "private",
@@ -29616,16 +30309,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -29635,7 +30328,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -29647,16 +30340,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -29666,7 +30359,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-491"
     },
     {
      "access" : "private",
@@ -29678,16 +30371,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -29697,7 +30390,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
@@ -29709,16 +30402,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1249",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -29740,7 +30433,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -29771,7 +30464,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -29802,7 +30495,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -29821,7 +30514,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -29833,13 +30526,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-74" ],
@@ -29852,7 +30545,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -29864,16 +30557,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-899"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-39"
     }
    ],
    "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-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-898",
+   "self_type" : "type-898",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -29883,7 +30607,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-890"
     },
     {
      "access" : "private",
@@ -29895,13 +30619,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-80" ],
@@ -29914,7 +30638,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -29926,16 +30650,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -29945,7 +30669,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-922"
     },
     {
      "access" : "private",
@@ -29957,16 +30681,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -29976,7 +30700,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-911"
     },
     {
      "access" : "private",
@@ -29988,16 +30712,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -30007,7 +30731,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30019,13 +30743,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30038,19 +30762,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -30060,10 +30784,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -30072,13 +30796,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -30200,10 +30924,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-969"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -30212,19 +30936,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1093"
+     "referenced_type" : "type-1144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1094"
+     "referenced_type" : "type-1145"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "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",
@@ -30408,7 +31132,7 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
@@ -30418,13 +31142,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-948",
+   "self_type" : "type-948",
    "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"
@@ -30555,8 +31279,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "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",
@@ -30708,23 +31432,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-910"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1096",
    "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"
@@ -30739,8 +31463,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "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",
@@ -30855,17 +31579,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-295"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-296" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -30875,17 +31599,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -30915,17 +31639,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -30935,17 +31659,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -30955,17 +31679,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-40" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -30975,17 +31699,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -30995,17 +31719,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -31015,17 +31739,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -31035,17 +31759,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -31055,17 +31779,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -31075,17 +31799,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-443"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-442",
+   "self_type" : "type-442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -31095,17 +31819,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -31115,17 +31839,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -31135,17 +31859,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -31155,17 +31879,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -31175,17 +31899,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -31195,17 +31919,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -31215,17 +31939,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -31235,17 +31959,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-491"
+     "referenced_type" : "type-497"
     }
    ],
    "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-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -31255,17 +31979,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-905",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -31281,8 +32005,8 @@
    "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-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -31295,17 +32019,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-269"
     }
    ],
    "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-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-267" ],
+   "template_args" : [ "type-270" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -31315,47 +32039,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-336"
     }
    ],
    "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-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-354" ],
+   "template_args" : [ "type-337" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31365,63 +32089,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31431,8 +32155,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31442,8 +32166,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31453,63 +32177,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31519,63 +32243,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31585,8 +32309,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31596,8 +32320,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31607,33 +32331,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -31644,26 +32368,26 @@
    "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31673,63 +32397,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-708",
+   "self_type" : "type-708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31739,8 +32463,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31750,8 +32474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31761,85 +32485,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "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-924",
-   "self_type" : "type-924",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-44" ],
    "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-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-54" ],
    "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-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31849,63 +32573,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31915,8 +32639,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31926,8 +32650,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31937,33 +32661,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -31973,7 +32697,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     },
     {
      "access" : "private",
@@ -31985,11 +32709,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32011,8 +32735,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -32025,7 +32749,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
@@ -32037,11 +32761,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32076,18 +32800,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -32103,18 +32827,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1009"
+     "referenced_type" : "type-1060"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1068"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -32125,7 +32849,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1064"
     },
     {
      "field_name" : "num_planes",
@@ -32135,13 +32859,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-1066"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -32152,48 +32876,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1061"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -32204,38 +32928,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -32246,18 +32970,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -32268,17 +32992,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
@@ -32298,13 +33022,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1009"
+     "referenced_type" : "type-1060"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32314,13 +33038,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -32331,35 +33055,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-394"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v3",
      "referenced_type" : "type-395"
     },
     {
+     "field_name" : "entry_v4",
+     "referenced_type" : "type-395"
+    },
+    {
+     "field_name" : "entry_v3",
+     "referenced_type" : "type-398"
+    },
+    {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-400"
     }
    ],
    "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-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "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)"
@@ -32380,8 +33104,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -32392,43 +33116,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -32439,32 +33163,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -32474,13 +33198,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -32491,32 +33215,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -32526,13 +33250,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -32543,17 +33267,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -32583,13 +33307,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -32600,28 +33324,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-166"
+     "referenced_type" : "type-171"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -32633,8 +33357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32642,8 +33366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-584",
-   "self_type" : "type-586",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32651,8 +33375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32660,8 +33384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-241",
-   "self_type" : "type-246",
+   "referenced_type" : "type-246",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32669,8 +33393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-430",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32678,8 +33402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-617",
-   "self_type" : "type-619",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32687,8 +33411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-561",
-   "self_type" : "type-579",
+   "referenced_type" : "type-552",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32696,8 +33420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-620",
-   "self_type" : "type-626",
+   "referenced_type" : "type-629",
+   "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32705,8 +33429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-540",
+   "referenced_type" : "type-248",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32714,8 +33438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-608",
+   "referenced_type" : "type-247",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32723,8 +33447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-160",
-   "self_type" : "type-831",
+   "referenced_type" : "type-165",
+   "self_type" : "type-873",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32732,8 +33456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-829",
-   "self_type" : "type-835",
+   "referenced_type" : "type-871",
+   "self_type" : "type-877",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32741,8 +33465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-375",
-   "self_type" : "type-387",
+   "referenced_type" : "type-372",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32750,8 +33474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-208",
-   "self_type" : "type-221",
+   "referenced_type" : "type-213",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32759,8 +33483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-212",
-   "self_type" : "type-415",
+   "referenced_type" : "type-217",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32768,8 +33492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-460",
-   "self_type" : "type-473",
+   "referenced_type" : "type-459",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32777,8 +33501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32786,8 +33510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-186",
-   "self_type" : "type-238",
+   "referenced_type" : "type-191",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32795,8 +33519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-407",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32804,8 +33528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-591",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32813,8 +33537,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-496",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32822,8 +33546,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-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32831,8 +33555,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-280",
-   "self_type" : "type-279",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32840,8 +33564,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-512",
-   "self_type" : "type-511",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32849,8 +33573,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32858,8 +33582,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-978",
-   "self_type" : "type-977",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32867,8 +33591,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32876,8 +33600,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32885,8 +33609,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32894,8 +33618,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32903,8 +33627,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
+   "referenced_type" : "type-697",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32912,8 +33636,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32921,8 +33645,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32930,8 +33654,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32939,8 +33663,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32948,8 +33672,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-980",
-   "self_type" : "type-979",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }

diff --git a/Q/64/x86_64/source-based/android.hardware.drm@1.2.so.lsdump b/Q/64/x86_64/source-based/android.hardware.drm@1.2.so.lsdump
index 5f87de2..c4be791 100644
--- a/Q/64/x86_64/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/64/x86_64/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-396",
+   "referenced_type" : "type-59",
+   "self_type" : "type-398",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [64]",
+   "name" : "char [64]",
+   "referenced_type" : "type-59",
+   "self_type" : "type-1034",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-793",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-835",
+   "self_type" : "type-1069",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-39",
-   "self_type" : "type-167",
+   "referenced_type" : "type-27",
+   "self_type" : "type-172",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-91",
-   "self_type" : "type-887",
+   "self_type" : "type-929",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-91",
-   "self_type" : "type-861",
+   "self_type" : "type-903",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-91",
-   "self_type" : "type-393",
+   "self_type" : "type-395",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1010",
+   "self_type" : "type-1061",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1
   },
   {
@@ -78,8 +87,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 1
   },
   {
@@ -88,8 +97,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 2
   },
   {
@@ -104,8 +113,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 8
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-735",
+   "self_type" : "type-735",
    "size" : 2
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1
   },
   {
@@ -179,8 +188,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -189,8 +198,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 8
   },
   {
@@ -199,15 +208,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -351,6 +360,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -474,6 +486,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -525,6 +540,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -993,6 +1011,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1032,6 +1053,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1047,6 +1071,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1065,6 +1092,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEmm"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEmm"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1601,8 +1634,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1030",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1619,8 +1652,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1637,8 +1670,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-954",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1663,11 +1696,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1693,11 +1726,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1715,8 +1748,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-941",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1741,11 +1774,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1795,11 +1828,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1849,8 +1882,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1871,8 +1904,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1905,8 +1938,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1935,8 +1968,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1969,8 +2002,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
+   "referenced_type" : "type-488",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1995,8 +2028,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2025,8 +2058,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2091,8 +2124,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2197,8 +2230,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::KeyRequestType",
    "name" : "android::hardware::drm::V1_1::KeyRequestType",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2235,8 +2268,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2294,6 +2327,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2415,11 +2486,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "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-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2433,11 +2504,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1096",
    "size" : 4,
    "source_file" : "/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-39",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2459,8 +2530,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "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-91",
@@ -2563,8 +2634,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2589,8 +2660,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2631,8 +2702,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2873,8 +2944,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2903,8 +2974,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2933,8 +3004,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -2975,8 +3046,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3013,8 +3084,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3039,8 +3110,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3057,8 +3128,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3087,8 +3158,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3181,8 +3252,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3223,8 +3294,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3241,8 +3312,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3271,8 +3342,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3305,8 +3376,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3359,8 +3430,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3376,18 +3447,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-43",
+   "return_type" : "type-41",
+   "self_type" : "type-43",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3397,12 +3468,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1022",
-   "return_type" : "type-39",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1074",
+   "return_type" : "type-27",
+   "self_type" : "type-1074",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3412,27 +3483,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-981"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-937",
-   "return_type" : "type-41",
-   "self_type" : "type-937",
+   "referenced_type" : "type-979",
+   "return_type" : "type-29",
+   "self_type" : "type-979",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3445,14 +3516,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-408",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3462,16 +3533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3481,13 +3552,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1286"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3497,13 +3568,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1236"
+     "referenced_type" : "type-1287"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3513,14 +3584,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-408",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3530,13 +3601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3546,13 +3617,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1288"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3562,14 +3633,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3579,13 +3650,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1289"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3595,10 +3666,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3608,10 +3679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3620,13 +3691,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3636,10 +3707,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3649,16 +3720,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3667,14 +3738,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3683,14 +3754,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3699,14 +3770,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3715,14 +3786,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3733,13 +3804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-404"
+     "referenced_type" : "type-421"
     },
     {
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-1294"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3749,13 +3820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-404"
+     "referenced_type" : "type-421"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-407"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3765,13 +3836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-404"
+     "referenced_type" : "type-421"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-407"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3781,14 +3852,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-187",
+   "return_type" : "type-192",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3798,16 +3869,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3817,13 +3888,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1322"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3833,13 +3904,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1323"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3849,14 +3920,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-187",
+   "return_type" : "type-192",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3866,13 +3937,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3882,13 +3953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1273"
+     "referenced_type" : "type-1324"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3898,14 +3969,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3915,13 +3986,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-1274"
+     "referenced_type" : "type-1325"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3931,10 +4002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3944,10 +4015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3956,13 +4027,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3972,10 +4043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3985,16 +4056,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4003,14 +4074,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-235"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4019,14 +4090,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-241"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4035,14 +4106,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4051,14 +4122,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-192"
+     "referenced_type" : "type-197"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4069,13 +4140,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-207"
     },
     {
-     "referenced_type" : "type-1278"
+     "referenced_type" : "type-1329"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4085,13 +4156,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-207"
     },
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4101,13 +4172,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-207"
     },
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4117,16 +4188,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -4134,10 +4205,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1332"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4148,13 +4219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1333"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4163,19 +4234,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1283"
+     "referenced_type" : "type-1334"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4184,19 +4255,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1284"
+     "referenced_type" : "type-1335"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-988"
+    },
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1336"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4205,19 +4297,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1285"
+     "referenced_type" : "type-1337"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4226,19 +4318,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1286"
+     "referenced_type" : "type-1338"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4247,19 +4339,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1287"
+     "referenced_type" : "type-1339"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4268,19 +4360,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-1340"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4289,19 +4381,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1289"
+     "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4312,10 +4404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4325,13 +4417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4341,13 +4433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-387"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4357,10 +4449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4370,10 +4462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4383,10 +4475,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-400"
+     "referenced_type" : "type-416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4396,13 +4488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-1342"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4412,13 +4504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4428,16 +4520,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4447,13 +4539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1343"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4463,16 +4555,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4482,13 +4574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-223"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4498,13 +4590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4514,13 +4606,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1292"
+     "referenced_type" : "type-1344"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4530,13 +4622,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4546,13 +4638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1294"
+     "referenced_type" : "type-1346"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4562,28 +4654,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1295"
+     "referenced_type" : "type-1347"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4593,16 +4685,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-1348"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4612,13 +4704,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4628,13 +4720,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1297"
+     "referenced_type" : "type-1349"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4644,13 +4736,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1298"
+     "referenced_type" : "type-1350"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4660,16 +4752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1299"
+     "referenced_type" : "type-1351"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4679,19 +4771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4701,16 +4793,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     },
     {
-     "referenced_type" : "type-1300"
+     "referenced_type" : "type-1352"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4720,16 +4812,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4739,13 +4831,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1301"
+     "referenced_type" : "type-1353"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4755,16 +4847,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1354"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4774,13 +4866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4790,13 +4882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1303"
+     "referenced_type" : "type-1355"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4806,28 +4898,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1304"
+     "referenced_type" : "type-1356"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4837,28 +4929,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1305"
+     "referenced_type" : "type-1357"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4868,16 +4960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1306"
+     "referenced_type" : "type-1358"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4887,13 +4979,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4903,16 +4995,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4922,19 +5014,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4944,13 +5036,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-575"
+     "referenced_type" : "type-599"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-426"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4960,16 +5074,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4979,13 +5093,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4995,19 +5109,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1309"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5017,13 +5131,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5033,16 +5147,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-1363"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5052,10 +5166,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5065,13 +5179,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5081,16 +5195,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5100,13 +5214,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5116,16 +5230,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5135,10 +5249,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5148,10 +5262,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5161,10 +5275,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5174,16 +5288,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1364"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5192,16 +5306,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-1313"
+     "referenced_type" : "type-1365"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5210,31 +5324,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1108"
     },
     {
-     "referenced_type" : "type-504"
+     "referenced_type" : "type-524"
     },
     {
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1366"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5244,19 +5358,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1367"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1220"
+    },
+    {
+     "referenced_type" : "type-1196"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5266,16 +5404,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1368"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5284,16 +5422,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5302,16 +5440,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5321,13 +5459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1369"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5336,19 +5474,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-1370"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5357,22 +5495,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1319"
+     "referenced_type" : "type-1371"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5381,16 +5519,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1372"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5400,10 +5538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5413,22 +5551,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1321"
+     "referenced_type" : "type-1373"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5438,16 +5576,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5457,25 +5595,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1374"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5485,25 +5623,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1323"
+     "referenced_type" : "type-1375"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5513,25 +5651,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1376"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5541,25 +5679,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1325"
+     "referenced_type" : "type-1377"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5569,19 +5707,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5591,13 +5729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5607,13 +5745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5623,14 +5761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1156",
+   "return_type" : "type-1207",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5640,16 +5778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5659,13 +5797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1326"
+     "referenced_type" : "type-1378"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5675,13 +5813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1327"
+     "referenced_type" : "type-1379"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5691,14 +5829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1156",
+   "return_type" : "type-1207",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5708,13 +5846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5724,13 +5862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1328"
+     "referenced_type" : "type-1380"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5740,14 +5878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5757,13 +5895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-1329"
+     "referenced_type" : "type-1381"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5773,10 +5911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5786,10 +5924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5798,13 +5936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5814,10 +5952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5827,16 +5965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5845,14 +5983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1268"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5861,14 +5999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5877,14 +6015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1209"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5894,16 +6032,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -5911,10 +6049,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1382"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5925,13 +6063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-1331"
+     "referenced_type" : "type-1383"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5940,19 +6078,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1332"
+     "referenced_type" : "type-1384"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5963,10 +6101,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5976,13 +6114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-192"
+     "referenced_type" : "type-197"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5992,13 +6130,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-192"
+     "referenced_type" : "type-197"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6008,10 +6146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6021,10 +6159,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6034,10 +6172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-203"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6047,16 +6185,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6066,19 +6204,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1385"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6088,13 +6226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1334"
+     "referenced_type" : "type-1386"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6104,13 +6242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1335"
+     "referenced_type" : "type-1387"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6120,13 +6258,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6136,13 +6274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6152,13 +6290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1337"
+     "referenced_type" : "type-1389"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6168,10 +6306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6181,10 +6319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6194,13 +6332,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6210,13 +6348,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6226,19 +6364,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6247,22 +6385,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6272,10 +6410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6285,16 +6423,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6304,13 +6442,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6320,13 +6458,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6337,13 +6475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1341"
+     "referenced_type" : "type-1393"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6353,13 +6491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6369,13 +6507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6385,14 +6523,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-465",
+   "return_type" : "type-461",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6402,16 +6540,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6421,13 +6559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1345"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6437,13 +6575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6453,14 +6591,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-465",
+   "return_type" : "type-461",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6470,13 +6608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6486,13 +6624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6502,14 +6640,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6519,13 +6657,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-1348"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6535,10 +6673,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6548,10 +6686,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6560,13 +6698,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6576,10 +6714,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6589,16 +6727,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6611,10 +6749,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6623,14 +6761,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-455"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6639,14 +6777,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6655,14 +6793,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1198"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6673,13 +6811,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6689,13 +6827,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6705,13 +6843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-1227"
     },
     {
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-495"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6721,16 +6859,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -6738,10 +6876,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1407"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6752,13 +6890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1408"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6767,19 +6905,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1357"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6790,10 +6928,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6803,13 +6941,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1209"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6819,13 +6957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     },
     {
-     "referenced_type" : "type-1158"
+     "referenced_type" : "type-1209"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6835,10 +6973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6848,10 +6986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6861,10 +6999,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1160"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6874,40 +7012,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1110"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-159"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1273"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-162"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6917,16 +7055,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6936,13 +7074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1411"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6952,13 +7090,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1412"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6968,13 +7106,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6984,13 +7122,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1413"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7000,7 +7138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
      "referenced_type" : "type-2"
@@ -7009,7 +7147,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7018,43 +7156,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1110"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-159"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1273"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-162"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1414"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7064,13 +7202,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1175",
+   "return_type" : "type-1228",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7080,13 +7218,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7096,16 +7234,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-875"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7115,10 +7253,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7128,10 +7266,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7141,13 +7279,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7157,10 +7295,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7170,16 +7308,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7189,40 +7327,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1110"
     },
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-159"
     },
     {
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-1273"
     },
     {
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-162"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-168"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7232,13 +7370,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7248,13 +7386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-1216"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7264,16 +7402,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7281,10 +7419,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7295,13 +7433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7312,10 +7450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7325,13 +7463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1198"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7341,13 +7479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1146"
+     "referenced_type" : "type-1198"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7357,10 +7495,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7370,10 +7508,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7383,10 +7521,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7396,16 +7534,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7415,19 +7553,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1419"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7437,13 +7575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1420"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7453,13 +7591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7469,13 +7607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7485,13 +7623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1370"
+     "referenced_type" : "type-1422"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7501,13 +7639,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1423"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7517,10 +7655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7530,10 +7668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7543,13 +7681,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-1179"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7559,10 +7697,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7572,16 +7710,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7591,13 +7729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7607,13 +7745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7623,14 +7761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-592",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7640,16 +7778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7659,13 +7797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1424"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7675,13 +7813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1425"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7691,14 +7829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-592",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7708,13 +7846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7724,13 +7862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1426"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7740,14 +7878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7757,13 +7895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1375"
+     "referenced_type" : "type-1427"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7773,10 +7911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7786,10 +7924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7798,13 +7936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
-     "referenced_type" : "type-1092"
+     "referenced_type" : "type-1143"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7814,10 +7952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7827,16 +7965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7845,14 +7983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-223"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7861,14 +7999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-1217"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7877,14 +8015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-625"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7895,13 +8033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-602"
+     "referenced_type" : "type-632"
     },
     {
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1430"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7911,13 +8049,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-602"
+     "referenced_type" : "type-632"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7927,13 +8065,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-602"
+     "referenced_type" : "type-632"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7943,16 +8081,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7960,10 +8098,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7974,13 +8112,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-988"
+    },
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1435"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7989,19 +8148,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-946"
+     "referenced_type" : "type-988"
     },
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-39",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8012,10 +8171,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8025,13 +8184,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8041,13 +8200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     },
     {
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8057,10 +8216,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8070,10 +8229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8083,10 +8242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-599"
+     "referenced_type" : "type-629"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8096,16 +8255,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8115,13 +8274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8131,13 +8290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8147,13 +8306,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-563",
+   "return_type" : "type-557",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8163,13 +8322,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8179,19 +8338,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8201,13 +8382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1387"
+     "referenced_type" : "type-1440"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8217,16 +8398,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8236,13 +8417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8252,10 +8433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8265,10 +8446,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1220"
+    },
+    {
+     "referenced_type" : "type-1196"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-526"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8277,16 +8482,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     },
     {
-     "referenced_type" : "type-1144"
+     "referenced_type" : "type-1196"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8296,10 +8501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8309,16 +8514,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8328,19 +8533,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-630",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8350,13 +8555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8366,33 +8571,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-50"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEmm",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-32"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEmm",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-32"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-211", "type-405" ]
+   "template_args" : [ "type-410", "type-216", "type-422" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8400,18 +8647,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-405" ]
+   "template_args" : [ "type-410", "type-411", "type-422" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8419,18 +8666,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-431",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-405" ]
+   "template_args" : [ "type-410", "type-5", "type-422" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8438,18 +8685,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-189", "type-191", "type-203" ]
+   "template_args" : [ "type-194", "type-196", "type-208" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8457,18 +8704,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-189", "type-190", "type-203" ]
+   "template_args" : [ "type-194", "type-195", "type-208" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8476,18 +8723,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-242",
+   "return_type" : "type-247",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-189", "type-5", "type-203" ]
+   "template_args" : [ "type-194", "type-5", "type-208" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8495,18 +8742,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-133", "type-134", "type-139" ]
+   "template_args" : [ "type-140", "type-141", "type-144" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8514,18 +8761,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1181",
+   "return_type" : "type-1234",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-133", "type-5", "type-139" ]
+   "template_args" : [ "type-140", "type-5", "type-144" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8533,18 +8780,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-467", "type-414", "type-1122" ]
+   "template_args" : [ "type-463", "type-419", "type-1174" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8552,18 +8799,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-467", "type-440", "type-1122" ]
+   "template_args" : [ "type-463", "type-446", "type-1174" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8571,18 +8818,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-585",
+   "return_type" : "type-604",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-467", "type-5", "type-1122" ]
+   "template_args" : [ "type-463", "type-5", "type-1174" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8590,18 +8837,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-594", "type-215", "type-603" ]
+   "template_args" : [ "type-623", "type-220", "type-633" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8609,18 +8856,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-618",
+   "return_type" : "type-649",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-594", "type-5", "type-603" ]
+   "template_args" : [ "type-623", "type-5", "type-633" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8628,12 +8875,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
-   "return_type" : "type-209",
+   "return_type" : "type-214",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-211", "type-41" ]
+   "template_args" : [ "type-216", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8641,12 +8888,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
-   "return_type" : "type-376",
+   "return_type" : "type-373",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-134", "type-41" ]
+   "template_args" : [ "type-141", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8654,12 +8901,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
-   "return_type" : "type-213",
+   "return_type" : "type-218",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-215", "type-41" ]
+   "template_args" : [ "type-220", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8667,18 +8914,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-529"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-408",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-405", "type-384", "type-41", "type-41" ]
+   "template_args" : [ "type-422", "type-410", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8686,18 +8933,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-187",
+   "return_type" : "type-192",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-203", "type-189", "type-41", "type-41" ]
+   "template_args" : [ "type-208", "type-194", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8705,18 +8952,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1277"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-1156",
+   "return_type" : "type-1207",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-139", "type-133", "type-41", "type-41" ]
+   "template_args" : [ "type-144", "type-140", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8724,18 +8971,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-949"
+     "referenced_type" : "type-991"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-465",
+   "return_type" : "type-461",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1122", "type-467", "type-41", "type-41" ]
+   "template_args" : [ "type-1174", "type-463", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8743,18 +8990,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-690"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-592",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-603", "type-594", "type-41", "type-41" ]
+   "template_args" : [ "type-633", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8762,31 +9009,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-57",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8796,8 +9043,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-34",
+   "self_type" : "type-1079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8805,8 +9052,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8814,8 +9061,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-922",
+   "referenced_type" : "type-46",
+   "self_type" : "type-964",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8823,8 +9070,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-917",
+   "referenced_type" : "type-56",
+   "self_type" : "type-959",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8832,8 +9079,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8841,8 +9088,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-585",
-   "self_type" : "type-590",
+   "referenced_type" : "type-604",
+   "self_type" : "type-607",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8850,8 +9097,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1237",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8859,8 +9106,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-242",
-   "self_type" : "type-248",
+   "referenced_type" : "type-247",
+   "self_type" : "type-253",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8868,8 +9115,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8877,8 +9124,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-618",
-   "self_type" : "type-621",
+   "referenced_type" : "type-649",
+   "self_type" : "type-652",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8886,8 +9133,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-563",
-   "self_type" : "type-581",
+   "referenced_type" : "type-557",
+   "self_type" : "type-584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8895,8 +9142,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-624",
-   "self_type" : "type-630",
+   "referenced_type" : "type-630",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8904,8 +9151,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-244",
-   "self_type" : "type-554",
+   "referenced_type" : "type-249",
+   "self_type" : "type-545",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8913,8 +9160,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8922,8 +9169,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-281",
+   "self_type" : "type-280",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8931,8 +9178,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-501",
-   "self_type" : "type-500",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8940,8 +9187,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8949,8 +9196,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8958,8 +9205,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8967,8 +9214,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-469",
-   "self_type" : "type-698",
+   "referenced_type" : "type-484",
+   "self_type" : "type-751",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-613",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8976,8 +9232,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-857",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1187",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8985,8 +9241,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-848",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8994,8 +9250,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-681",
+   "referenced_type" : "type-105",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9003,8 +9259,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-472",
-   "self_type" : "type-701",
+   "referenced_type" : "type-487",
+   "self_type" : "type-755",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-124",
+   "self_type" : "type-614",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9012,8 +9277,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-902",
+   "self_type" : "type-1190",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9021,8 +9286,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-829",
-   "self_type" : "type-834",
+   "referenced_type" : "type-871",
+   "self_type" : "type-876",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9031,7 +9296,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-82",
-   "self_type" : "type-1133",
+   "self_type" : "type-1185",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9039,8 +9304,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-644",
+   "referenced_type" : "type-483",
+   "self_type" : "type-672",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9048,8 +9322,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-856",
-   "self_type" : "type-867",
+   "referenced_type" : "type-898",
+   "self_type" : "type-909",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9057,8 +9331,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-847",
-   "self_type" : "type-855",
+   "referenced_type" : "type-889",
+   "self_type" : "type-897",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9066,8 +9340,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-642",
+   "referenced_type" : "type-104",
+   "self_type" : "type-670",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9075,8 +9349,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-376",
-   "self_type" : "type-386",
+   "referenced_type" : "type-373",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9084,8 +9358,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-209",
-   "self_type" : "type-221",
+   "referenced_type" : "type-214",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9093,8 +9367,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-213",
-   "self_type" : "type-415",
+   "referenced_type" : "type-218",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9102,8 +9376,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-482",
+   "referenced_type" : "type-461",
+   "self_type" : "type-472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9111,8 +9385,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9120,8 +9394,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-187",
-   "self_type" : "type-240",
+   "referenced_type" : "type-192",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9129,8 +9403,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-408",
+   "self_type" : "type-442",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9138,8 +9412,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-592",
-   "self_type" : "type-614",
+   "referenced_type" : "type-621",
+   "self_type" : "type-647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9147,8 +9421,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-491",
-   "self_type" : "type-502",
+   "referenced_type" : "type-497",
+   "self_type" : "type-512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9156,8 +9430,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-45",
+   "self_type" : "type-44",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9165,8 +9439,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-913",
-   "self_type" : "type-916",
+   "referenced_type" : "type-955",
+   "self_type" : "type-958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9174,8 +9448,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-944",
-   "self_type" : "type-945",
+   "referenced_type" : "type-986",
+   "self_type" : "type-987",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9183,8 +9457,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-582",
-   "self_type" : "type-600",
+   "referenced_type" : "type-587",
+   "self_type" : "type-610",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9192,8 +9466,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-531",
-   "self_type" : "type-540",
+   "referenced_type" : "type-538",
+   "self_type" : "type-539",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9201,8 +9475,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-955",
-   "self_type" : "type-954",
+   "referenced_type" : "type-997",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9210,8 +9484,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-168",
+   "referenced_type" : "type-163",
+   "self_type" : "type-173",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9219,8 +9493,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9228,8 +9502,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-461",
-   "self_type" : "type-579",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9237,8 +9511,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-152",
-   "self_type" : "type-154",
+   "referenced_type" : "type-157",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9246,8 +9520,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-157",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9255,8 +9529,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9264,8 +9538,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-179",
+   "self_type" : "type-178",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9273,8 +9547,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-175",
+   "self_type" : "type-174",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9282,17 +9556,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-574",
-   "self_type" : "type-575",
+   "referenced_type" : "type-598",
+   "self_type" : "type-599",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1179",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9300,8 +9583,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-898",
+   "referenced_type" : "type-939",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9309,8 +9592,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
+   "referenced_type" : "type-874",
+   "self_type" : "type-875",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9318,8 +9601,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-828",
+   "referenced_type" : "type-868",
+   "self_type" : "type-870",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9327,8 +9610,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-573",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9336,8 +9619,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-504",
+   "referenced_type" : "type-481",
+   "self_type" : "type-524",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9345,8 +9628,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1273",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9354,8 +9637,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1257",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9363,8 +9646,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1264",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9372,17 +9655,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-526",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1090",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1142",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9390,8 +9682,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-483",
-   "self_type" : "type-503",
+   "referenced_type" : "type-505",
+   "self_type" : "type-523",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9399,8 +9691,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-874",
+   "referenced_type" : "type-914",
+   "self_type" : "type-916",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9408,8 +9700,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
+   "referenced_type" : "type-917",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9417,8 +9709,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-892",
-   "self_type" : "type-894",
+   "referenced_type" : "type-934",
+   "self_type" : "type-936",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9426,8 +9718,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-969",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1012",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9435,8 +9727,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9444,7 +9736,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-427",
+   "referenced_type" : "type-428",
    "self_type" : "type-429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9453,8 +9745,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-406",
+   "self_type" : "type-1268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9462,8 +9754,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-229",
-   "self_type" : "type-230",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9471,8 +9763,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9480,8 +9772,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-217",
-   "self_type" : "type-218",
+   "referenced_type" : "type-222",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9489,8 +9781,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-445",
-   "self_type" : "type-451",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9498,8 +9790,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-235",
-   "self_type" : "type-236",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9507,8 +9799,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9516,8 +9808,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-489",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-495",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9525,8 +9817,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9534,8 +9826,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-192",
+   "referenced_type" : "type-191",
+   "self_type" : "type-197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9543,8 +9835,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-387",
+   "referenced_type" : "type-407",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9552,8 +9844,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-595",
+   "referenced_type" : "type-620",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9561,8 +9853,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-509",
-   "self_type" : "type-810",
+   "referenced_type" : "type-516",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9570,8 +9862,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-862",
-   "self_type" : "type-878",
+   "referenced_type" : "type-904",
+   "self_type" : "type-920",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9579,8 +9871,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-1165",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9588,8 +9880,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-368",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-370",
+   "self_type" : "type-1143",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9597,8 +9889,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1184",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9606,8 +9898,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-1148",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9615,8 +9907,8 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-803",
+   "referenced_type" : "type-298",
+   "self_type" : "type-845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9624,8 +9916,8 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-819",
+   "referenced_type" : "type-860",
+   "self_type" : "type-861",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9633,8 +9925,8 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-816",
-   "self_type" : "type-817",
+   "referenced_type" : "type-858",
+   "self_type" : "type-859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9642,59 +9934,59 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-999",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1044",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1245",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-256",
+   "referenced_type" : "type-259",
+   "self_type" : "type-261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-464",
+   "self_type" : "type-467",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-635",
-   "self_type" : "type-637",
+   "referenced_type" : "type-662",
+   "self_type" : "type-664",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
+   "referenced_type" : "type-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-841",
+   "referenced_type" : "type-881",
+   "self_type" : "type-883",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-390",
-   "self_type" : "type-485",
+   "referenced_type" : "type-392",
+   "self_type" : "type-480",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9702,8 +9994,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-813",
-   "self_type" : "type-814",
+   "referenced_type" : "type-855",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9711,8 +10003,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-807",
-   "self_type" : "type-808",
+   "referenced_type" : "type-849",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9720,8 +10012,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-804",
-   "self_type" : "type-806",
+   "referenced_type" : "type-846",
+   "self_type" : "type-848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9729,8 +10021,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-1223",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1277",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9738,8 +10030,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-276",
-   "self_type" : "type-278",
+   "referenced_type" : "type-282",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9747,8 +10039,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-505",
-   "self_type" : "type-507",
+   "referenced_type" : "type-527",
+   "self_type" : "type-529",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9756,8 +10048,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-655",
-   "self_type" : "type-657",
+   "referenced_type" : "type-688",
+   "self_type" : "type-690",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9765,8 +10057,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-947",
-   "self_type" : "type-949",
+   "referenced_type" : "type-989",
+   "self_type" : "type-991",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9774,8 +10066,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-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9783,8 +10075,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-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9792,8 +10084,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-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9801,8 +10093,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-379",
-   "self_type" : "type-378",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9810,8 +10102,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-588",
-   "self_type" : "type-706",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9819,8 +10111,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-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9828,8 +10120,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-885",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-927",
+   "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9837,8 +10129,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-812",
+   "referenced_type" : "type-38",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9846,8 +10138,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-815",
+   "referenced_type" : "type-39",
+   "self_type" : "type-857",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9855,8 +10147,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-809",
-   "self_type" : "type-811",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9864,8 +10156,8 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-909",
+   "referenced_type" : "type-27",
+   "self_type" : "type-951",
    "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"
   },
@@ -9874,7 +10166,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-91",
-   "self_type" : "type-1048",
+   "self_type" : "type-1099",
    "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"
   },
@@ -9883,7 +10175,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1061",
+   "self_type" : "type-1112",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -9894,8 +10186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-300",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-299",
+   "self_type" : "type-1082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -9903,8 +10195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-34",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9912,8 +10204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9921,8 +10213,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1085",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9930,8 +10222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9939,8 +10231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9949,7 +10241,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-824",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9957,8 +10249,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9966,8 +10258,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9975,8 +10267,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "type-458",
+   "self_type" : "type-457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9984,8 +10276,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9993,8 +10285,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-766",
+   "self_type" : "type-765",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10020,8 +10312,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-821",
+   "referenced_type" : "type-862",
+   "self_type" : "type-863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10029,8 +10321,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1092",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10038,8 +10330,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-923",
+   "referenced_type" : "type-46",
+   "self_type" : "type-965",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10047,8 +10339,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-918",
+   "referenced_type" : "type-56",
+   "self_type" : "type-960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10056,8 +10348,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-298",
-   "self_type" : "type-297",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10065,8 +10357,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-634",
-   "self_type" : "type-658",
+   "referenced_type" : "type-644",
+   "self_type" : "type-669",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10074,8 +10366,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-515",
+   "referenced_type" : "type-201",
+   "self_type" : "type-518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10083,8 +10375,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10092,8 +10384,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10101,8 +10393,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-273",
+   "referenced_type" : "type-211",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10110,8 +10402,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-498",
+   "referenced_type" : "type-425",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10119,17 +10411,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-652",
+   "referenced_type" : "type-636",
+   "self_type" : "type-683",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-992",
+   "self_type" : "type-1035",
+   "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-1000",
+   "self_type" : "type-1038",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-963",
-   "self_type" : "type-968",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1010",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10137,8 +10447,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-982",
-   "self_type" : "type-988",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1030",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10146,8 +10456,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-971",
-   "self_type" : "type-977",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1019",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10155,8 +10465,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10164,8 +10474,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10182,8 +10492,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-148",
+   "self_type" : "type-1220",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10191,8 +10501,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-938",
+   "referenced_type" : "type-975",
+   "self_type" : "type-980",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10200,8 +10510,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10209,8 +10519,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1229",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10218,8 +10528,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-586",
+   "referenced_type" : "type-604",
+   "self_type" : "type-605",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10227,8 +10537,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1235",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10236,8 +10546,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-246",
+   "referenced_type" : "type-247",
+   "self_type" : "type-251",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10245,8 +10555,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-432",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10254,8 +10564,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-619",
+   "referenced_type" : "type-649",
+   "self_type" : "type-650",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10263,8 +10573,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-577",
+   "referenced_type" : "type-557",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10272,8 +10582,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "type-630",
+   "self_type" : "type-639",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10281,17 +10591,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-524",
+   "referenced_type" : "type-249",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1033",
+   "self_type" : "type-1036",
+   "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-1037",
+   "self_type" : "type-1039",
+   "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-1040",
+   "self_type" : "type-1041",
+   "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-147",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-152",
+   "self_type" : "type-1196",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10299,8 +10636,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-697",
+   "referenced_type" : "type-484",
+   "self_type" : "type-750",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10308,8 +10654,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-857",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1186",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10317,8 +10663,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-848",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10326,8 +10672,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-673",
+   "referenced_type" : "type-105",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10335,8 +10681,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-608",
+   "referenced_type" : "type-248",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10344,8 +10690,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1158",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10353,8 +10699,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1151",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10362,8 +10708,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-346",
+   "referenced_type" : "type-353",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10371,8 +10717,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-339",
+   "referenced_type" : "type-346",
+   "self_type" : "type-347",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10380,8 +10726,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-332",
+   "referenced_type" : "type-336",
+   "self_type" : "type-337",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10389,8 +10735,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-414",
-   "self_type" : "type-413",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10398,8 +10744,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-377",
+   "referenced_type" : "type-141",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10407,8 +10753,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-191",
-   "self_type" : "type-227",
+   "referenced_type" : "type-196",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10416,8 +10762,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
+   "referenced_type" : "type-216",
+   "self_type" : "type-215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10425,8 +10771,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-214",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10434,8 +10780,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-487",
+   "self_type" : "type-486",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10443,8 +10789,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10452,8 +10798,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-493",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10461,8 +10807,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-186",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10470,8 +10816,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10479,8 +10825,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-353",
+   "referenced_type" : "type-360",
+   "self_type" : "type-361",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10488,8 +10834,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-564",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10498,7 +10844,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-76",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10533,8 +10879,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-446",
+   "self_type" : "type-445",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10542,8 +10888,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-233",
+   "referenced_type" : "type-195",
+   "self_type" : "type-238",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10551,8 +10897,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-419",
+   "referenced_type" : "type-411",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10560,8 +10906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-987",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1148",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10569,8 +10915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1211",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10578,8 +10924,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-198",
+   "referenced_type" : "type-198",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10587,8 +10933,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-400",
+   "referenced_type" : "type-415",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10596,8 +10942,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-599",
+   "referenced_type" : "type-627",
+   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10605,8 +10951,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10614,8 +10960,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-144",
+   "self_type" : "type-1216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10623,8 +10969,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-207",
+   "referenced_type" : "type-208",
+   "self_type" : "type-212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10632,8 +10978,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-405",
-   "self_type" : "type-409",
+   "referenced_type" : "type-422",
+   "self_type" : "type-426",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10641,8 +10987,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-607",
+   "referenced_type" : "type-633",
+   "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10650,8 +10996,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10659,8 +11005,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10668,8 +11014,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-202",
+   "referenced_type" : "type-204",
+   "self_type" : "type-207",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10677,8 +11023,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-403",
-   "self_type" : "type-404",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10686,8 +11032,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-602",
+   "referenced_type" : "type-631",
+   "self_type" : "type-632",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10695,8 +11041,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-466",
+   "referenced_type" : "type-463",
+   "self_type" : "type-462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10704,8 +11050,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-140",
+   "self_type" : "type-1208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10713,8 +11059,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
+   "referenced_type" : "type-194",
+   "self_type" : "type-193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10722,8 +11068,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10731,17 +11077,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-386",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10749,8 +11104,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10758,8 +11113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10767,8 +11122,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-502",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10776,8 +11131,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "referenced_type" : "type-871",
+   "self_type" : "type-872",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10786,7 +11141,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-82",
-   "self_type" : "type-850",
+   "self_type" : "type-892",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10794,8 +11149,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-643",
+   "referenced_type" : "type-483",
+   "self_type" : "type-671",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10803,8 +11167,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-856",
-   "self_type" : "type-864",
+   "referenced_type" : "type-898",
+   "self_type" : "type-906",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10812,8 +11176,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-847",
-   "self_type" : "type-852",
+   "referenced_type" : "type-889",
+   "self_type" : "type-894",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10821,8 +11185,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-371",
+   "referenced_type" : "type-104",
+   "self_type" : "type-380",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10830,8 +11194,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-891",
+   "referenced_type" : "type-932",
+   "self_type" : "type-933",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10839,8 +11203,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-946",
+   "referenced_type" : "type-199",
+   "self_type" : "type-988",
    "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"
   },
@@ -10857,8 +11221,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10866,8 +11230,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-360",
+   "referenced_type" : "type-340",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10884,8 +11248,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-25",
+   "referenced_type" : "type-16",
+   "self_type" : "type-19",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10893,8 +11257,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10902,8 +11266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-412",
-   "self_type" : "type-417",
+   "referenced_type" : "type-417",
+   "self_type" : "type-427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10911,8 +11275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-375",
+   "referenced_type" : "type-373",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10920,8 +11284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-228",
+   "referenced_type" : "type-231",
+   "self_type" : "type-233",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10929,8 +11293,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-220",
+   "referenced_type" : "type-214",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10938,8 +11302,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-213",
-   "self_type" : "type-216",
+   "referenced_type" : "type-218",
+   "self_type" : "type-221",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10947,8 +11311,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-441",
+   "referenced_type" : "type-444",
+   "self_type" : "type-452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10956,8 +11320,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-232",
-   "self_type" : "type-234",
+   "referenced_type" : "type-237",
+   "self_type" : "type-239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10965,8 +11329,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-418",
-   "self_type" : "type-420",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10974,8 +11338,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-464",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10983,8 +11347,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10992,8 +11356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-187",
-   "self_type" : "type-238",
+   "referenced_type" : "type-192",
+   "self_type" : "type-243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11001,8 +11365,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-408",
+   "self_type" : "type-440",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11010,8 +11374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11019,8 +11383,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-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-497",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11028,8 +11392,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-195",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11037,7 +11401,7 @@
    "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-266",
+   "referenced_type" : "type-269",
    "self_type" : "type-279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -11046,8 +11410,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-359",
-   "self_type" : "type-364",
+   "referenced_type" : "type-338",
+   "self_type" : "type-369",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11055,8 +11419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-976",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11064,8 +11428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-625",
+   "referenced_type" : "type-525",
+   "self_type" : "type-638",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11073,8 +11437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-827",
+   "referenced_type" : "type-500",
+   "self_type" : "type-869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11083,7 +11447,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1145",
+   "self_type" : "type-1197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11091,8 +11455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1067",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11100,8 +11464,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11109,8 +11473,8 @@
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-610",
+   "referenced_type" : "type-59",
+   "self_type" : "type-616",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11118,8 +11482,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-905",
+   "referenced_type" : "type-946",
+   "self_type" : "type-947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11127,8 +11491,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-864",
+   "self_type" : "type-865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11136,8 +11500,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-921",
+   "referenced_type" : "type-45",
+   "self_type" : "type-963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11145,8 +11509,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-915",
+   "referenced_type" : "type-955",
+   "self_type" : "type-957",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11154,8 +11518,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11163,8 +11527,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-925",
-   "self_type" : "type-926",
+   "referenced_type" : "type-967",
+   "self_type" : "type-968",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11172,8 +11536,8 @@
    "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-956",
-   "self_type" : "type-957",
+   "referenced_type" : "type-998",
+   "self_type" : "type-999",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11181,8 +11545,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-962",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1004",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11190,8 +11554,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1179",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11199,8 +11563,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-596",
-   "self_type" : "type-597",
+   "referenced_type" : "type-608",
+   "self_type" : "type-609",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11208,8 +11572,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1239",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11217,8 +11581,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-254",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11226,8 +11590,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-453",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11235,8 +11599,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-653",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11244,8 +11608,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-584",
+   "referenced_type" : "type-587",
+   "self_type" : "type-603",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11253,8 +11617,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-531",
-   "self_type" : "type-561",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11262,8 +11626,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-700",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11271,8 +11635,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-578",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11280,8 +11644,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-182",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11289,8 +11653,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-125",
+   "self_type" : "type-136",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11298,8 +11662,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-176",
+   "referenced_type" : "type-180",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11307,8 +11671,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
+   "referenced_type" : "type-176",
+   "self_type" : "type-177",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11316,8 +11689,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1189",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11325,8 +11698,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-1130",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11334,8 +11707,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-382",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11343,8 +11716,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1073",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11352,8 +11725,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1128",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11361,8 +11734,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-616",
+   "referenced_type" : "type-624",
+   "self_type" : "type-626",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11370,8 +11743,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1164",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11379,8 +11752,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11388,8 +11761,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-351",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11397,8 +11770,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-344",
+   "referenced_type" : "type-351",
+   "self_type" : "type-352",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11406,8 +11779,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-337",
+   "referenced_type" : "type-344",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11415,8 +11788,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11424,8 +11797,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-411",
+   "referenced_type" : "type-413",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11433,8 +11806,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-318",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11442,8 +11815,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-225",
+   "referenced_type" : "type-229",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11451,8 +11824,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-316",
+   "referenced_type" : "type-320",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11460,8 +11833,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11469,8 +11842,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11478,8 +11851,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1172",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11487,8 +11860,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-358",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11496,8 +11869,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-568",
-   "self_type" : "type-569",
+   "referenced_type" : "type-591",
+   "self_type" : "type-592",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11505,8 +11878,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1085",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1138",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11514,8 +11887,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-320",
+   "referenced_type" : "type-324",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11523,8 +11896,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11532,8 +11905,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11541,8 +11914,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-151",
+   "referenced_type" : "type-143",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11550,8 +11923,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-363",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11559,8 +11932,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-571",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11568,8 +11941,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-747",
+   "self_type" : "type-748",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11577,8 +11950,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1140",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11586,8 +11959,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-135",
+   "referenced_type" : "type-139",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11595,8 +11968,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-329",
-   "self_type" : "type-330",
+   "referenced_type" : "type-334",
+   "self_type" : "type-335",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11604,8 +11977,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-582",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11613,17 +11986,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-692",
+   "referenced_type" : "type-744",
+   "self_type" : "type-745",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1265",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11631,8 +12013,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1202",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11640,8 +12022,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-836",
+   "referenced_type" : "type-874",
+   "self_type" : "type-878",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11649,8 +12031,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-572",
-   "self_type" : "type-649",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11658,8 +12040,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-463",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11667,8 +12049,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1254",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11676,8 +12058,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1256",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11685,8 +12067,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11694,8 +12076,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1260",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11703,8 +12094,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-483",
-   "self_type" : "type-484",
+   "referenced_type" : "type-505",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11712,8 +12103,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-914",
+   "self_type" : "type-915",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11721,8 +12112,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-876",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11730,8 +12121,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-892",
-   "self_type" : "type-893",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11739,8 +12130,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1149",
    "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"
   },
@@ -11748,8 +12139,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11757,8 +12148,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-293",
+   "referenced_type" : "type-293",
+   "self_type" : "type-294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11766,8 +12157,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
    "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"
   },
@@ -11775,8 +12166,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11784,8 +12175,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-265",
+   "referenced_type" : "type-267",
+   "self_type" : "type-268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11793,8 +12184,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11802,8 +12193,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11811,8 +12202,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-231",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11820,8 +12211,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-223",
+   "referenced_type" : "type-213",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11829,8 +12220,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-217",
-   "self_type" : "type-219",
+   "referenced_type" : "type-222",
+   "self_type" : "type-224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11838,8 +12229,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-454",
+   "referenced_type" : "type-454",
+   "self_type" : "type-456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11847,8 +12238,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-235",
-   "self_type" : "type-237",
+   "referenced_type" : "type-240",
+   "self_type" : "type-242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11856,8 +12247,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11865,8 +12256,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-489",
-   "self_type" : "type-488",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11874,8 +12265,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11883,8 +12274,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-241",
+   "referenced_type" : "type-191",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11892,8 +12283,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-428",
+   "referenced_type" : "type-407",
+   "self_type" : "type-443",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11901,8 +12292,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-648",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11910,8 +12301,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-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11919,8 +12310,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-862",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11928,8 +12319,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-1165",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1272",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11937,8 +12328,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-286",
-   "self_type" : "type-287",
+   "referenced_type" : "type-284",
+   "self_type" : "type-286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11946,8 +12337,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-368",
-   "self_type" : "type-374",
+   "referenced_type" : "type-370",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11955,8 +12346,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11964,8 +12355,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-838",
-   "self_type" : "type-851",
+   "referenced_type" : "type-880",
+   "self_type" : "type-893",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11973,8 +12364,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11982,8 +12373,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-58",
+   "self_type" : "type-57",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11991,8 +12382,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12000,8 +12391,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-390",
-   "self_type" : "type-437",
+   "referenced_type" : "type-392",
+   "self_type" : "type-438",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12009,8 +12400,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12018,8 +12409,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12027,8 +12418,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12036,8 +12427,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-896",
+   "referenced_type" : "type-937",
+   "self_type" : "type-938",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12045,8 +12436,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1075",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12054,8 +12445,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-871",
+   "referenced_type" : "type-27",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12063,8 +12454,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-583",
+   "referenced_type" : "type-393",
+   "self_type" : "type-597",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12072,8 +12463,8 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-648",
+   "referenced_type" : "type-171",
+   "self_type" : "type-658",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12082,7 +12473,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-91",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12090,8 +12481,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-32",
+   "self_type" : "type-1274",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12099,8 +12490,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-935",
+   "referenced_type" : "type-830",
+   "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12108,8 +12499,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12117,8 +12508,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-40",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12126,8 +12517,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-40",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1076",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12139,8 +12530,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12149,8 +12540,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-251",
-   "self_type" : "type-253",
+   "referenced_type" : "type-256",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12159,8 +12550,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-442",
-   "self_type" : "type-444",
+   "referenced_type" : "type-457",
+   "self_type" : "type-459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12169,8 +12560,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-631",
+   "referenced_type" : "type-659",
+   "self_type" : "type-661",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12179,8 +12570,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-765",
+   "self_type" : "type-767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12199,8 +12590,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-145",
+   "referenced_type" : "type-17",
+   "self_type" : "type-150",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12209,8 +12600,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-647",
-   "self_type" : "type-904",
+   "referenced_type" : "type-657",
+   "self_type" : "type-946",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12220,7 +12611,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-822",
+   "self_type" : "type-864",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12229,8 +12620,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12239,8 +12630,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-913",
+   "referenced_type" : "type-56",
+   "self_type" : "type-955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12249,8 +12640,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-49",
-   "self_type" : "type-991",
+   "referenced_type" : "type-37",
+   "self_type" : "type-1042",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12259,8 +12650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-144",
-   "self_type" : "type-925",
+   "referenced_type" : "type-149",
+   "self_type" : "type-967",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12269,8 +12660,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-950",
-   "self_type" : "type-956",
+   "referenced_type" : "type-992",
+   "self_type" : "type-998",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12279,8 +12670,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-958",
-   "self_type" : "type-961",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1003",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12289,8 +12680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-933",
-   "self_type" : "type-944",
+   "referenced_type" : "type-975",
+   "self_type" : "type-986",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12299,8 +12690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1232",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12309,8 +12700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-585",
-   "self_type" : "type-596",
+   "referenced_type" : "type-604",
+   "self_type" : "type-608",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12319,8 +12710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1238",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12329,8 +12720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-249",
+   "referenced_type" : "type-247",
+   "self_type" : "type-254",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12339,8 +12730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12349,8 +12740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-618",
-   "self_type" : "type-622",
+   "referenced_type" : "type-649",
+   "self_type" : "type-653",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12359,8 +12750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-563",
-   "self_type" : "type-582",
+   "referenced_type" : "type-557",
+   "self_type" : "type-587",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12369,8 +12760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-244",
-   "self_type" : "type-531",
+   "referenced_type" : "type-249",
+   "self_type" : "type-538",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12379,8 +12770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-953",
-   "self_type" : "type-955",
+   "referenced_type" : "type-995",
+   "self_type" : "type-997",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12389,8 +12780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-699",
+   "referenced_type" : "type-484",
+   "self_type" : "type-753",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12399,8 +12790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12409,8 +12800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-178",
-   "self_type" : "type-177",
+   "referenced_type" : "type-183",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12420,7 +12811,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-86",
-   "self_type" : "type-136",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12430,7 +12821,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-78",
-   "self_type" : "type-175",
+   "self_type" : "type-180",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12440,7 +12831,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-94",
-   "self_type" : "type-171",
+   "self_type" : "type-176",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12449,8 +12850,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-857",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1188",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12459,8 +12860,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-848",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12469,8 +12870,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-369",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12479,8 +12880,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-869",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-911",
+   "self_type" : "type-1062",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12489,8 +12890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-105",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12499,8 +12900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-611",
+   "referenced_type" : "type-248",
+   "self_type" : "type-624",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12509,8 +12910,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1163",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12519,8 +12920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1155",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12529,8 +12930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-347",
-   "self_type" : "type-350",
+   "referenced_type" : "type-355",
+   "self_type" : "type-358",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12539,8 +12940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-340",
-   "self_type" : "type-343",
+   "referenced_type" : "type-348",
+   "self_type" : "type-351",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12549,8 +12950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-333",
-   "self_type" : "type-336",
+   "referenced_type" : "type-341",
+   "self_type" : "type-344",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12559,8 +12960,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-160",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-165",
+   "self_type" : "type-1119",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12569,8 +12970,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "type-164",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12579,8 +12980,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12589,8 +12990,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-414",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-419",
+   "self_type" : "type-1135",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12599,8 +13000,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-134",
-   "self_type" : "type-410",
+   "referenced_type" : "type-141",
+   "self_type" : "type-413",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12609,8 +13010,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-191",
-   "self_type" : "type-317",
+   "referenced_type" : "type-196",
+   "self_type" : "type-322",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12619,8 +13020,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-211",
-   "self_type" : "type-224",
+   "referenced_type" : "type-216",
+   "self_type" : "type-229",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12629,8 +13030,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-215",
-   "self_type" : "type-315",
+   "referenced_type" : "type-220",
+   "self_type" : "type-320",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12639,8 +13040,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12649,8 +13050,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-472",
-   "self_type" : "type-703",
+   "referenced_type" : "type-487",
+   "self_type" : "type-757",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12659,8 +13060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-473",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12669,8 +13070,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12679,8 +13080,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-459",
-   "self_type" : "type-461",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12689,8 +13090,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1118",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12699,8 +13100,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12709,8 +13110,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-161",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12719,8 +13120,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12729,8 +13130,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-181",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-186",
+   "self_type" : "type-1252",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12739,8 +13140,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1171",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -12749,8 +13150,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-354",
-   "self_type" : "type-357",
+   "referenced_type" : "type-362",
+   "self_type" : "type-365",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -12759,8 +13160,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-565",
-   "self_type" : "type-568",
+   "referenced_type" : "type-588",
+   "self_type" : "type-591",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -12770,7 +13171,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-89",
-   "self_type" : "type-113",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12780,7 +13181,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-81",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12790,7 +13191,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-97",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12800,7 +13201,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-90",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12810,7 +13211,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12819,8 +13220,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-440",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-446",
+   "self_type" : "type-1137",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -12829,8 +13230,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-319",
+   "referenced_type" : "type-195",
+   "self_type" : "type-324",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -12839,8 +13240,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-550",
+   "referenced_type" : "type-411",
+   "self_type" : "type-570",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -12849,8 +13250,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12859,8 +13260,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-101",
-   "self_type" : "type-574",
+   "referenced_type" : "type-103",
+   "self_type" : "type-598",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12869,8 +13270,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-100",
-   "self_type" : "type-109",
+   "referenced_type" : "type-102",
+   "self_type" : "type-111",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12879,8 +13280,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1173",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -12889,8 +13290,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-144",
+   "self_type" : "type-143",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12899,8 +13300,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-362",
+   "referenced_type" : "type-208",
+   "self_type" : "type-367",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -12909,8 +13310,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-405",
-   "self_type" : "type-570",
+   "referenced_type" : "type-422",
+   "self_type" : "type-593",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12919,8 +13320,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-603",
-   "self_type" : "type-694",
+   "referenced_type" : "type-633",
+   "self_type" : "type-747",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -12930,7 +13331,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-122",
-   "self_type" : "type-125",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -12939,8 +13340,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-467",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-463",
+   "self_type" : "type-1139",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -12949,8 +13350,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-132",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -12959,8 +13360,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-329",
+   "referenced_type" : "type-194",
+   "self_type" : "type-334",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -12969,8 +13370,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-410",
+   "self_type" : "type-582",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -12979,18 +13380,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-594",
-   "self_type" : "type-691",
+   "referenced_type" : "type-623",
+   "self_type" : "type-744",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-124",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-123",
+   "self_type" : "type-129",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13000,7 +13421,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13009,8 +13430,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1178",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13019,8 +13440,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-496",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-502",
+   "self_type" : "type-1201",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13029,8 +13450,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-161",
-   "self_type" : "type-897",
+   "referenced_type" : "type-166",
+   "self_type" : "type-939",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13039,8 +13460,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-832",
+   "referenced_type" : "type-871",
+   "self_type" : "type-874",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13050,7 +13471,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-82",
-   "self_type" : "type-826",
+   "self_type" : "type-868",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13059,8 +13480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-572",
+   "referenced_type" : "type-483",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13069,8 +13490,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-462",
+   "referenced_type" : "type-473",
+   "self_type" : "type-481",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13079,8 +13500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13090,7 +13511,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-1204",
+   "self_type" : "type-1255",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13100,7 +13521,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-77",
-   "self_type" : "type-1211",
+   "self_type" : "type-1262",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13110,7 +13531,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-1207",
+   "self_type" : "type-1259",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13119,8 +13550,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-847",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-889",
+   "self_type" : "type-1141",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13129,8 +13560,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-505",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13139,8 +13570,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-872",
+   "referenced_type" : "type-910",
+   "self_type" : "type-914",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13149,8 +13580,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-875",
+   "referenced_type" : "type-104",
+   "self_type" : "type-917",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13159,8 +13590,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13169,8 +13600,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-1093",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1147",
    "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"
   },
@@ -13179,8 +13610,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-907",
-   "self_type" : "type-908",
+   "referenced_type" : "type-949",
+   "self_type" : "type-950",
    "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"
   },
@@ -13190,7 +13621,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-967",
+   "self_type" : "type-1009",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13199,8 +13630,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-966",
-   "self_type" : "type-969",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1011",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13209,8 +13640,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-268",
-   "self_type" : "type-288",
+   "referenced_type" : "type-271",
+   "self_type" : "type-293",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13219,8 +13650,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-1045",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13229,8 +13660,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-1044",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1098",
    "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"
   },
@@ -13239,8 +13670,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-361",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-340",
+   "self_type" : "type-1093",
    "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"
   },
@@ -13249,8 +13680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-51",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13259,8 +13690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-36",
-   "self_type" : "type-262",
+   "referenced_type" : "type-24",
+   "self_type" : "type-267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13269,8 +13700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-412",
-   "self_type" : "type-427",
+   "referenced_type" : "type-417",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13279,8 +13710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-402",
+   "referenced_type" : "type-373",
+   "self_type" : "type-406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13289,8 +13720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-229",
+   "referenced_type" : "type-231",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13299,8 +13730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "type-214",
+   "self_type" : "type-213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13309,8 +13740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-217",
+   "referenced_type" : "type-218",
+   "self_type" : "type-222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13319,8 +13750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-438",
-   "self_type" : "type-445",
+   "referenced_type" : "type-444",
+   "self_type" : "type-454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13329,8 +13760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13339,8 +13770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13349,8 +13780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-489",
+   "referenced_type" : "type-461",
+   "self_type" : "type-495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13359,8 +13790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13369,8 +13800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-187",
-   "self_type" : "type-186",
+   "referenced_type" : "type-192",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13379,8 +13810,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13389,8 +13820,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13399,8 +13830,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-491",
-   "self_type" : "type-509",
+   "referenced_type" : "type-497",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13409,8 +13840,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-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-905",
+   "self_type" : "type-904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13419,8 +13850,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-195",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-200",
+   "self_type" : "type-1213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13429,8 +13860,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-266",
-   "self_type" : "type-286",
+   "referenced_type" : "type-269",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13439,8 +13870,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-359",
-   "self_type" : "type-368",
+   "referenced_type" : "type-338",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13449,8 +13880,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1159",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13459,8 +13890,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-494",
-   "self_type" : "type-838",
+   "referenced_type" : "type-500",
+   "self_type" : "type-880",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13470,7 +13901,7 @@
    "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-3",
-   "self_type" : "type-1148",
+   "self_type" : "type-1200",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13479,8 +13910,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-41",
+   "self_type" : "type-298",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13489,8 +13920,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13499,8 +13930,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13510,7 +13941,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-92",
-   "self_type" : "type-818",
+   "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13519,8 +13950,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-793",
-   "self_type" : "type-816",
+   "referenced_type" : "type-835",
+   "self_type" : "type-858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13529,8 +13960,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-39",
-   "self_type" : "type-999",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13538,48 +13969,48 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
+   "referenced_type" : "type-260",
+   "self_type" : "type-259",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-636",
-   "self_type" : "type-635",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13587,8 +14018,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13597,8 +14028,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-45",
-   "self_type" : "type-813",
+   "referenced_type" : "type-33",
+   "self_type" : "type-855",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13607,8 +14038,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-171",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13617,8 +14048,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-717",
-   "self_type" : "type-807",
+   "referenced_type" : "type-735",
+   "self_type" : "type-849",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13627,8 +14058,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-847",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13637,8 +14068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13647,8 +14078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13657,8 +14088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-561",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13667,18 +14098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-724",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13695,10 +14116,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
+   "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13707,8 +14138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13717,8 +14148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13727,8 +14158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13737,8 +14168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13747,8 +14178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13757,8 +14188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13767,8 +14198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13777,8 +14208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13787,8 +14218,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13797,8 +14228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13807,8 +14238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-742",
-   "self_type" : "type-741",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13817,8 +14248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13827,8 +14258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-309",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13837,8 +14268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13847,8 +14278,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-534",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13857,8 +14288,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13867,8 +14298,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13877,8 +14308,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13887,8 +14318,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "type-311",
+   "self_type" : "type-310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13897,8 +14328,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13907,8 +14338,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13917,8 +14348,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13927,8 +14358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-740",
-   "self_type" : "type-739",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13937,8 +14368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13947,8 +14378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13957,8 +14388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13967,8 +14398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
+   "referenced_type" : "type-722",
+   "self_type" : "type-721",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13977,8 +14408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13987,8 +14418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13997,8 +14428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14007,8 +14438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14017,8 +14448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14027,8 +14458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14037,8 +14468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-711",
+   "self_type" : "type-710",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14047,8 +14478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-787",
+   "self_type" : "type-786",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14057,8 +14488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-113",
+   "self_type" : "type-112",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14067,8 +14498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14077,8 +14508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14087,8 +14518,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14107,8 +14548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-329",
+   "self_type" : "type-328",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14117,8 +14558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-565",
+   "self_type" : "type-564",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14127,8 +14568,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-729",
+   "self_type" : "type-728",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14147,8 +14598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14157,8 +14608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-546",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14167,8 +14618,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14187,8 +14648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14197,8 +14658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14207,8 +14668,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-757",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14217,38 +14688,88 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-135",
+   "self_type" : "type-134",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-741",
+   "self_type" : "type-740",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-581",
+   "self_type" : "type-580",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-743",
+   "self_type" : "type-742",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-131",
    "self_type" : "type-130",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14257,8 +14778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14267,8 +14788,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-737",
+   "self_type" : "type-736",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-812",
+   "self_type" : "type-811",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14277,8 +14808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-133",
+   "self_type" : "type-132",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14287,8 +14818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-555",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14297,8 +14828,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14307,8 +14848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14317,8 +14858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
+   "referenced_type" : "type-273",
+   "self_type" : "type-272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14327,8 +14868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14337,8 +14878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-650",
+   "referenced_type" : "type-681",
+   "self_type" : "type-680",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14347,8 +14888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-725",
-   "self_type" : "type-724",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14357,8 +14898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14367,8 +14908,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-1053",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14377,8 +14918,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-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14387,8 +14928,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-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-305",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14397,8 +14938,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-523",
-   "self_type" : "type-522",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14407,8 +14948,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-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-708",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14417,8 +14958,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-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1101",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14427,8 +14968,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-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14437,8 +14978,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-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14447,8 +14988,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-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14457,8 +14998,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-705",
+   "self_type" : "type-704",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14467,8 +15008,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-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1275",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14477,8 +15018,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-277",
-   "self_type" : "type-276",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14487,8 +15028,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-506",
-   "self_type" : "type-505",
+   "referenced_type" : "type-528",
+   "self_type" : "type-527",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14497,8 +15038,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-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-689",
+   "self_type" : "type-688",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14507,8 +15048,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-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14517,8 +15058,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-1198",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1248",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14527,8 +15068,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-260",
-   "self_type" : "type-259",
+   "referenced_type" : "type-265",
+   "self_type" : "type-264",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14537,8 +15078,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-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14547,8 +15088,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-641",
-   "self_type" : "type-640",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14557,8 +15098,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-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14567,8 +15108,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-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1246",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14577,8 +15118,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-258",
-   "self_type" : "type-257",
+   "referenced_type" : "type-263",
+   "self_type" : "type-262",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14587,8 +15128,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14597,8 +15138,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-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14607,8 +15148,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-854",
-   "self_type" : "type-853",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14617,8 +15158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14627,8 +15168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1204",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14637,8 +15178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-185",
-   "self_type" : "type-184",
+   "referenced_type" : "type-190",
+   "self_type" : "type-189",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14647,8 +15188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-380",
-   "self_type" : "type-379",
+   "referenced_type" : "type-404",
+   "self_type" : "type-403",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14657,8 +15198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-619",
+   "self_type" : "type-618",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14667,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-824",
+   "self_type" : "type-823",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14678,7 +15219,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-91",
-   "self_type" : "type-885",
+   "self_type" : "type-927",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14688,7 +15229,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-50",
+   "self_type" : "type-38",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14697,8 +15238,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-44",
-   "self_type" : "type-51",
+   "referenced_type" : "type-32",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14707,8 +15248,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-788",
-   "self_type" : "type-940",
+   "referenced_type" : "type-830",
+   "self_type" : "type-982",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14717,8 +15258,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-395",
-   "self_type" : "type-809",
+   "referenced_type" : "type-397",
+   "self_type" : "type-851",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14726,8 +15267,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-41",
-   "self_type" : "type-895",
+   "referenced_type" : "type-29",
+   "self_type" : "type-937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -14735,8 +15276,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-302",
+   "referenced_type" : "type-41",
+   "self_type" : "type-301",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -14745,8 +15286,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-39",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-60",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -14760,14 +15301,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -14779,17 +15320,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-53"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-46", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -14799,17 +15340,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-656"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-647" ],
+   "template_args" : [ "type-657" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -14819,17 +15360,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-643"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-642",
+   "self_type" : "type-642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-634" ],
+   "template_args" : [ "type-644" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -14839,14 +15380,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-35"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -14858,14 +15399,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1027"
+     "referenced_type" : "type-1079"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -14875,7 +15416,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-655"
     }
    ],
    "fields" :
@@ -14884,20 +15425,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-658"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-657",
+   "self_type" : "type-657",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -14909,14 +15450,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1084"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1083",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -14928,14 +15469,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1087"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -14947,14 +15488,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1087"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -15025,8 +15566,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -15036,8 +15577,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -15063,14 +15604,14 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1091",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -15081,17 +15622,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-54"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-55" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -15138,14 +15679,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -15203,14 +15744,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-47"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -15222,14 +15763,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -15249,62 +15790,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-34"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-299"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-295"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -15394,17 +15935,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-40" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -15451,32 +15992,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-38"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-37",
+   "self_type" : "type-37",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -15528,14 +16069,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-642"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -15563,7 +16104,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -15572,32 +16113,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 192,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -15713,7 +16254,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     },
     {
      "access" : "private",
@@ -15725,14 +16266,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -15820,23 +16361,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-419"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-414" ],
+   "template_args" : [ "type-419" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -16009,23 +16550,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-141"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -16210,23 +16751,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-196" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -16403,23 +16944,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-211" ],
+   "template_args" : [ "type-216" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -16696,23 +17237,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-220"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-215" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -16889,23 +17430,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-446"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-440" ],
+   "template_args" : [ "type-446" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17078,23 +17619,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17271,23 +17812,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-411" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -17604,23 +18145,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-463"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-932",
-   "self_type" : "type-932",
+   "referenced_type" : "type-974",
+   "self_type" : "type-974",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-467" ],
+   "template_args" : [ "type-463" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17793,23 +18334,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17998,23 +18539,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18195,23 +18736,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18448,6 +18989,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -18556,23 +19101,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-636",
+   "self_type" : "type-636",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-594" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18645,6 +19190,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -18756,17 +19305,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 64,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -18936,23 +19485,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-993"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-952"
+     "referenced_type" : "type-994"
     }
    ],
    "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-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-953" ],
+   "template_args" : [ "type-3", "type-995" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -18962,23 +19511,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-1001"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-960"
+     "referenced_type" : "type-1002"
     }
    ],
    "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-958",
-   "self_type" : "type-958",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-1000",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-41" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -18988,23 +19537,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-964"
+     "referenced_type" : "type-1006"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-965"
+     "referenced_type" : "type-1007"
     }
    ],
    "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-963",
-   "self_type" : "type-963",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1005",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-966", "type-889" ],
+   "template_args" : [ "type-1008", "type-931" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19014,23 +19563,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1025"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-984"
+     "referenced_type" : "type-1026"
     }
    ],
    "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-982",
-   "self_type" : "type-982",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1024",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-985", "type-986" ],
+   "template_args" : [ "type-1027", "type-1028" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19040,23 +19589,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-1014"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-1015"
     }
    ],
    "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-971",
-   "self_type" : "type-971",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1013",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-974", "type-975" ],
+   "template_args" : [ "type-1016", "type-1017" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19080,13 +19629,13 @@
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -19097,7 +19646,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-829"
+     "referenced_type" : "type-871"
     },
     {
      "is_virtual" : true,
@@ -19107,8 +19656,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-879",
+   "self_type" : "type-879",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19195,8 +19744,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -19400,8 +19949,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -19483,13 +20032,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-842"
+     "referenced_type" : "type-884"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-943"
     },
     {
      "access" : "private",
@@ -19506,11 +20055,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-942",
+   "self_type" : "type-942",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19520,110 +20069,110 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-976"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 320,
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-107"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 384,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 512,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 576,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-977"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 640,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 704,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 768,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 832,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 896,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 904,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 912,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-978"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 1024,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -19635,23 +20184,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-830"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-830"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-983",
+   "self_type" : "type-983",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -19671,122 +20220,122 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 128,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 896,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 960,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 1024,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 1088,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-34"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-36"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 1728,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-42"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 1856,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-52"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 2240,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 2304,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 2312,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-60"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 2368,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-61"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -19864,7 +20413,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -19874,8 +20423,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -19885,7 +20434,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19894,17 +20443,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1054" ],
+   "template_args" : [ "type-1106" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -19912,7 +20461,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19921,17 +20470,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-465"
+     "referenced_type" : "type-461"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-465" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -19939,7 +20488,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19948,17 +20497,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -19966,7 +20515,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -19975,17 +20524,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-187" ],
+   "template_args" : [ "type-192" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -19993,7 +20542,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -20002,17 +20551,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-408" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -20020,7 +20569,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -20029,17 +20578,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-649",
+   "self_type" : "type-649",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-592" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -20047,7 +20596,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "fields" :
@@ -20056,17 +20605,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-557",
+   "self_type" : "type-557",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20074,17 +20623,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20094,26 +20643,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -20123,34 +20672,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1034"
+    }
+   ],
+   "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-1033",
+   "self_type" : "type-1033",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-992" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1034"
+    }
+   ],
+   "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-1037",
+   "self_type" : "type-1037",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1000" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1034"
+    }
+   ],
+   "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-1040",
+   "self_type" : "type-1040",
+   "size" : 64,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1005" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-150"
+     "referenced_type" : "type-155"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-147",
-   "self_type" : "type-147",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20179,18 +20788,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-995",
+   "self_type" : "type-995",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20202,14 +20811,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20218,8 +20827,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20228,8 +20837,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20238,8 +20847,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20255,12 +20864,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-87",
    "self_type" : "type-87",
@@ -20275,19 +20884,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -20299,19 +20908,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-886",
+   "self_type" : "type-886",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -20323,19 +20932,43 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-471"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-486"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-32"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -20347,19 +20980,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -20375,12 +21008,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-79",
    "self_type" : "type-79",
@@ -20395,19 +21028,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-492"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -20419,19 +21052,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-185"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -20447,12 +21080,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-95",
    "self_type" : "type-95",
@@ -20466,16 +21099,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -20484,16 +21117,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-485"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-472" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -20502,16 +21135,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-459" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -20520,16 +21153,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-491"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-493" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -20538,16 +21171,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-186" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -20610,13 +21243,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-76" ],
@@ -20628,16 +21261,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-858"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-124" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-900"
     }
    ],
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-899",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -20646,13 +21297,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-891"
     }
    ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-890",
+   "self_type" : "type-890",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-82" ],
@@ -20664,16 +21315,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-104" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -20682,16 +21333,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-923"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20701,19 +21352,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-616"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-923",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20733,7 +21384,7 @@
    "self_type" : "type-83",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-58" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20743,16 +21394,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-84",
    "self_type" : "type-84",
@@ -20766,16 +21417,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20785,19 +21436,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-168",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20809,19 +21460,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-901"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEUt_E"
@@ -20833,19 +21484,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-850"
+     "referenced_type" : "type-892"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20857,19 +21508,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -20880,16 +21531,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-912"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -20899,19 +21550,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-871"
+     "referenced_type" : "type-913"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-912",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20922,16 +21573,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-943",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-166" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -20941,19 +21592,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-658"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20964,13 +21615,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-91" ],
@@ -20983,19 +21634,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-107"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -21004,8 +21655,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -21017,20 +21668,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -21039,8 +21690,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-924",
+   "self_type" : "type-924",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -21050,8 +21701,8 @@
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-925",
+   "self_type" : "type-925",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -21062,7 +21713,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21071,13 +21722,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1157",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -21199,7 +21850,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21208,13 +21859,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -21336,7 +21987,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21345,13 +21996,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -21473,7 +22124,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21482,13 +22133,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -21610,7 +22261,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -21619,13 +22270,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -21747,10 +22398,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-971"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -21759,19 +22410,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1109"
+     "referenced_type" : "type-1161"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1110"
+     "referenced_type" : "type-1162"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1160",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -21960,10 +22611,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-970"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -21972,19 +22623,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1153"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-1154"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1152",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -22182,10 +22833,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-276"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -22194,19 +22845,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-355",
+   "self_type" : "type-355",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -22398,10 +23049,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -22410,19 +23061,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -22689,10 +23340,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -22701,19 +23352,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-343"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -22906,23 +23557,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -22937,8 +23588,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -23060,8 +23711,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -23195,8 +23846,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -23322,8 +23973,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-216",
+   "self_type" : "type-216",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -23549,8 +24200,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -23672,18 +24323,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-488"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -23704,8 +24355,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -23726,8 +24377,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -23738,13 +24389,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-493",
+   "self_type" : "type-493",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -23760,18 +24411,18 @@
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "size",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -23792,8 +24443,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -23803,7 +24454,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -23812,13 +24463,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1113",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1165",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -23940,7 +24591,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -23949,13 +24600,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -24077,7 +24728,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -24086,13 +24737,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -24214,10 +24865,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -24226,19 +24877,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1116"
+     "referenced_type" : "type-1168"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1117"
+     "referenced_type" : "type-1169"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -24427,10 +25078,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -24439,19 +25090,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-363"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-364"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -24643,10 +25294,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-519"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -24655,19 +25306,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-590"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -24992,7 +25643,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     },
     {
      "field_name" : "doubleValue",
@@ -25056,7 +25707,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-33"
     },
     {
      "field_name" : "doubleValue",
@@ -25082,13 +25733,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-419"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-446",
+   "self_type" : "type-446",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -25205,13 +25856,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -25332,13 +25983,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -25600,13 +26251,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -25616,7 +26267,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -25625,13 +26276,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-465"
+     "referenced_type" : "type-461"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-987",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1029",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -25753,7 +26404,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -25762,13 +26413,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -25890,7 +26541,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -25899,13 +26550,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -26027,7 +26678,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -26036,13 +26687,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -26164,7 +26815,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "fields" :
@@ -26173,13 +26824,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -26301,10 +26952,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26313,19 +26964,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1123"
+     "referenced_type" : "type-1175"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1124"
+     "referenced_type" : "type-1176"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1174",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -26514,10 +27165,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26526,19 +27177,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -26739,10 +27390,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26751,19 +27402,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -26958,10 +27609,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -26970,19 +27621,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-422",
+   "self_type" : "type-422",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -27176,6 +27827,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -27300,10 +27954,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-606"
+     "referenced_type" : "type-636"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27312,19 +27966,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-633",
+   "self_type" : "type-633",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -27395,6 +28049,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -27519,10 +28176,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-463"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27531,19 +28188,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-495"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1170",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1221",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -27674,10 +28331,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27686,19 +28343,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -27841,10 +28498,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -27853,19 +28510,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -28002,10 +28659,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -28014,19 +28671,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-407"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -28220,6 +28877,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -8,
      "kind" : "offset_to_top"
     },
@@ -28286,10 +28946,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -28298,19 +28958,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -28381,6 +29041,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -8,
      "kind" : "offset_to_top"
     },
@@ -28447,13 +29110,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-446"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -28570,13 +29233,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -28709,13 +29372,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -28840,13 +29503,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-411"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -29085,6 +29748,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29135,13 +29802,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-220"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -29216,6 +29883,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29262,19 +29933,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-104"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-123"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -29287,13 +29980,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-903"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-902",
+   "self_type" : "type-902",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -29313,13 +30006,13 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 64,
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
      "field_name" : "mCookie",
      "field_offset" : 192,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
@@ -29330,8 +30023,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -29416,8 +30109,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -29499,19 +30192,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -29523,13 +30216,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
@@ -29540,8 +30233,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-871",
+   "self_type" : "type-871",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -29565,7 +30258,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -29583,7 +30276,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-885"
     },
     {
      "access" : "private",
@@ -29595,16 +30288,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-884",
+   "self_type" : "type-884",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -29614,7 +30307,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     },
     {
      "access" : "private",
@@ -29626,16 +30319,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-472" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -29645,7 +30338,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -29657,16 +30350,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-459" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -29676,7 +30369,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-490"
     },
     {
      "access" : "private",
@@ -29688,16 +30381,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-493" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -29707,7 +30400,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     },
     {
      "access" : "private",
@@ -29719,16 +30412,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1250",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-186" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -29750,7 +30443,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -29781,7 +30474,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -29812,7 +30505,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -29831,7 +30524,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -29843,13 +30536,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-76" ],
@@ -29862,7 +30555,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -29874,16 +30567,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-124" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-899"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-41"
     }
    ],
    "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-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-898",
+   "self_type" : "type-898",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -29893,7 +30617,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-890"
     },
     {
      "access" : "private",
@@ -29905,13 +30629,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-82" ],
@@ -29924,7 +30648,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -29936,16 +30660,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-104" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -29955,7 +30679,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-922"
     },
     {
      "access" : "private",
@@ -29967,16 +30691,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -29986,7 +30710,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-911"
     },
     {
      "access" : "private",
@@ -29998,16 +30722,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -30017,7 +30741,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
@@ -30029,13 +30753,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-91" ],
@@ -30048,19 +30772,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -30070,10 +30794,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -30082,13 +30806,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 960,
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "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",
@@ -30210,10 +30934,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-969"
     },
     {
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     }
    ],
    "fields" :
@@ -30222,19 +30946,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-1094"
+     "referenced_type" : "type-1145"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-1095"
+     "referenced_type" : "type-1146"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1144",
    "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",
@@ -30418,23 +31142,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-948",
+   "self_type" : "type-948",
    "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"
@@ -30565,8 +31289,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "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",
@@ -30718,23 +31442,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-910"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1097",
    "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"
@@ -30749,8 +31473,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "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",
@@ -30865,17 +31589,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-296"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-298" ],
+   "template_args" : [ "type-297" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -30885,17 +31609,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-515"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-201" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -30925,17 +31649,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -30945,17 +31669,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1220"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-148" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -30965,17 +31689,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-38" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -30985,17 +31709,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-418"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-414" ],
+   "template_args" : [ "type-419" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -31005,17 +31729,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-374"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-134" ],
+   "template_args" : [ "type-141" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -31025,17 +31749,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-232"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-191" ],
+   "template_args" : [ "type-196" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -31045,17 +31769,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-211" ],
+   "template_args" : [ "type-216" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -31065,17 +31789,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-215" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -31085,17 +31809,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-440" ],
+   "template_args" : [ "type-446" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -31105,17 +31829,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -31125,17 +31849,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-411" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -31145,17 +31869,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-466"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-467" ],
+   "template_args" : [ "type-463" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -31165,17 +31889,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -31185,17 +31909,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -31205,17 +31929,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-409"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -31225,17 +31949,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-594" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -31245,17 +31969,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-492"
+     "referenced_type" : "type-498"
     }
    ],
    "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-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-493" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -31265,17 +31989,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-501"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-905",
+   "self_type" : "type-905",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-496" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -31291,8 +32015,8 @@
    "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-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -31305,17 +32029,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-270"
     }
    ],
    "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-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-268" ],
+   "template_args" : [ "type-271" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -31325,47 +32049,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-339"
     }
    ],
    "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-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-361" ],
+   "template_args" : [ "type-340" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31375,63 +32099,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31441,8 +32165,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31452,74 +32176,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-810",
+   "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-682",
+   "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-696",
+   "self_type" : "type-696",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31529,63 +32253,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-734",
+   "self_type" : "type-734",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31595,8 +32319,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31606,74 +32330,74 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-688",
-   "self_type" : "type-688",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31683,63 +32407,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31749,8 +32473,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31760,96 +32484,96 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "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-924",
-   "self_type" : "type-924",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-46" ],
    "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-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-56" ],
    "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-696",
-   "self_type" : "type-696",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-59" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -31859,63 +32583,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-793" ],
+   "template_args" : [ "type-835" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-782" ],
+   "template_args" : [ "type-821" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-785",
+   "self_type" : "type-785",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-717" ],
+   "template_args" : [ "type-735" ],
    "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-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31925,8 +32649,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31936,44 +32660,44 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-788" ],
+   "template_args" : [ "type-830" ],
    "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-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-44" ],
+   "template_args" : [ "type-32" ],
    "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-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-397" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -31983,7 +32707,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-515"
+     "referenced_type" : "type-518"
     },
     {
      "access" : "private",
@@ -31995,11 +32719,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-201" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32021,8 +32745,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -32035,7 +32759,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-495"
+     "referenced_type" : "type-501"
     },
     {
      "access" : "private",
@@ -32047,11 +32771,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-496" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32086,18 +32810,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -32113,18 +32837,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1061"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1068",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -32135,7 +32859,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1013"
+     "referenced_type" : "type-1065"
     },
     {
      "field_name" : "num_planes",
@@ -32145,13 +32869,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1015"
+     "referenced_type" : "type-1067"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -32162,48 +32886,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-107"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-1011"
+     "referenced_type" : "type-1063"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -32214,38 +32938,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1018"
+     "referenced_type" : "type-1070"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1071",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -32256,18 +32980,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-835"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -32278,43 +33002,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1061"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32324,13 +33048,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -32341,35 +33065,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-395"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-398"
+     "referenced_type" : "type-400"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-401"
     }
    ],
    "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-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-394",
+   "self_type" : "type-394",
    "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)"
@@ -32390,8 +33114,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -32402,43 +33126,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -32449,32 +33173,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -32484,13 +33208,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -32501,32 +33225,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -32536,13 +33260,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -32553,17 +33277,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-397"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -32593,13 +33317,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-398"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -32610,28 +33334,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -32643,8 +33367,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32652,8 +33376,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-585",
-   "self_type" : "type-587",
+   "referenced_type" : "type-604",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32661,8 +33385,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1236",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32670,8 +33394,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-247",
+   "referenced_type" : "type-247",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32679,8 +33403,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-431",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32688,8 +33412,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-618",
-   "self_type" : "type-620",
+   "referenced_type" : "type-649",
+   "self_type" : "type-651",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32697,8 +33421,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-563",
-   "self_type" : "type-580",
+   "referenced_type" : "type-557",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32706,8 +33430,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-624",
-   "self_type" : "type-627",
+   "referenced_type" : "type-630",
+   "self_type" : "type-640",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32715,8 +33439,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-244",
-   "self_type" : "type-545",
+   "referenced_type" : "type-249",
+   "self_type" : "type-540",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32724,8 +33448,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-609",
+   "referenced_type" : "type-248",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32733,8 +33457,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-161",
-   "self_type" : "type-831",
+   "referenced_type" : "type-166",
+   "self_type" : "type-873",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32742,8 +33466,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-829",
-   "self_type" : "type-835",
+   "referenced_type" : "type-871",
+   "self_type" : "type-877",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32751,8 +33475,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-376",
-   "self_type" : "type-388",
+   "referenced_type" : "type-373",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32760,8 +33484,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-209",
-   "self_type" : "type-222",
+   "referenced_type" : "type-214",
+   "self_type" : "type-227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32769,8 +33493,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-213",
-   "self_type" : "type-416",
+   "referenced_type" : "type-218",
+   "self_type" : "type-431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32778,8 +33502,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-465",
-   "self_type" : "type-479",
+   "referenced_type" : "type-461",
+   "self_type" : "type-466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32787,8 +33511,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32796,8 +33520,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-187",
-   "self_type" : "type-239",
+   "referenced_type" : "type-192",
+   "self_type" : "type-244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32805,8 +33529,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-408",
+   "self_type" : "type-441",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32814,8 +33538,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-592",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32823,8 +33547,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-491",
-   "self_type" : "type-499",
+   "referenced_type" : "type-497",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32832,8 +33556,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-1228",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32841,8 +33565,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-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32850,8 +33574,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-511",
-   "self_type" : "type-510",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32859,8 +33583,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-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32868,8 +33592,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-979",
-   "self_type" : "type-978",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32877,8 +33601,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32886,8 +33610,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32895,8 +33619,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-517",
-   "self_type" : "type-516",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32904,8 +33628,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-664",
-   "self_type" : "type-663",
+   "referenced_type" : "type-537",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32913,8 +33637,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-990",
-   "self_type" : "type-989",
+   "referenced_type" : "type-698",
+   "self_type" : "type-697",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32922,8 +33646,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32931,8 +33655,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1280",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32940,8 +33664,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-290",
+   "self_type" : "type-289",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32949,8 +33673,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-662",
-   "self_type" : "type-661",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32958,8 +33682,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-981",
-   "self_type" : "type-980",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }

diff --git a/Q/64/x86_x86_64/source-based/android.hardware.drm@1.2.so.lsdump b/Q/64/x86_x86_64/source-based/android.hardware.drm@1.2.so.lsdump
index ad3dfab..f204c54 100644
--- a/Q/64/x86_x86_64/source-based/android.hardware.drm@1.2.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/android.hardware.drm@1.2.so.lsdump

@@ -5,23 +5,32 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-71",
-   "self_type" : "type-394",
+   "referenced_type" : "type-57",
+   "self_type" : "type-397",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-57",
+   "self_type" : "type-1033",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-792",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-834",
+   "self_type" : "type-1068",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-41",
-   "self_type" : "type-166",
+   "referenced_type" : "type-27",
+   "self_type" : "type-171",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
@@ -29,7 +38,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-887",
+   "self_type" : "type-929",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -38,7 +47,7 @@
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
    "referenced_type" : "type-90",
-   "self_type" : "type-861",
+   "self_type" : "type-903",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -47,7 +56,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-391",
+   "self_type" : "type-394",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -56,7 +65,7 @@
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
    "referenced_type" : "type-2",
-   "self_type" : "type-1009",
+   "self_type" : "type-1060",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +78,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1
   },
   {
@@ -78,8 +87,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1
   },
   {
@@ -88,8 +97,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-47",
+   "self_type" : "type-47",
    "size" : 2
   },
   {
@@ -104,8 +113,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-834",
+   "self_type" : "type-834",
    "size" : 4
   },
   {
@@ -113,8 +122,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4
   },
   {
@@ -122,8 +131,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-779",
+   "self_type" : "type-779",
    "size" : 4
   },
   {
@@ -131,8 +140,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
@@ -140,8 +149,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 2
   },
   {
@@ -149,8 +158,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1
   },
   {
@@ -179,8 +188,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 4
   },
   {
@@ -199,15 +208,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43"
+   "referenced_type" : "type-29",
+   "self_type" : "type-29"
   }
  ],
  "elf_functions" :
@@ -351,6 +360,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin23_hidl_getKeyRequest_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin26_hidl_removeOfflineLicenseEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -474,6 +486,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18releaseSecureStopsERKNS1_4V1_117SecureStopReleaseE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18setCipherAlgorithmERKNS0_8hidl_vecIhEERKNS0_11hidl_stringE"
   },
   {
@@ -525,6 +540,9 @@
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin23getProvisionRequest_1_2ERKNS0_11hidl_stringES6_NSt3__18functionIFvNS2_6StatusERKNS0_8hidl_vecIhEES6_EEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24provideProvisionResponseERKNS0_8hidl_vecIhEENSt3__18functionIFvNS1_4V1_06StatusES7_S7_EEE"
   },
   {
@@ -993,6 +1011,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener26_hidl_sendSessionLostStateEPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE"
   },
   {
@@ -1032,6 +1053,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener14sendKeysChangeERKNS0_8hidl_vecIhEERKNS4_INS1_4V1_09KeyStatusEEEb"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
   },
   {
@@ -1047,6 +1071,9 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener21setHALInstrumentationEv"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb"
+  },
+  {
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener26_hidl_sendSessionLostStateEPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEE"
   },
   {
@@ -1065,6 +1092,12 @@
    "name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListenerC2ERKNS_2spINS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb"
   },
@@ -1601,8 +1634,8 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "underlying_type" : "type-2",
@@ -1619,8 +1652,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-920",
-   "self_type" : "type-920",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -1637,8 +1670,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-954",
+   "self_type" : "type-954",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -1663,11 +1696,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -1693,11 +1726,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -1715,8 +1748,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-899",
-   "self_type" : "type-899",
+   "referenced_type" : "type-941",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-2",
@@ -1741,11 +1774,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -1795,11 +1828,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -1849,8 +1882,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1138",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-2",
@@ -1871,8 +1904,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BufferType",
    "name" : "android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1905,8 +1938,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::EventType",
    "name" : "android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1935,8 +1968,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyRequestType",
    "name" : "android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1969,8 +2002,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatusType",
    "name" : "android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-487",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -1995,8 +2028,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyType",
    "name" : "android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2025,8 +2058,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Mode",
    "name" : "android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2091,8 +2124,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Status",
    "name" : "android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "underlying_type" : "type-2",
@@ -2235,8 +2268,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecurityLevel",
    "name" : "android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "underlying_type" : "type-2",
@@ -2294,6 +2327,44 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::EXPIRED"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::OUTPUTNOTALLOWED"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::STATUSPENDING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::INTERNALERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::hardware::drm::V1_2::KeyStatusType::USABLEINFUTURE"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_213KeyStatusTypeE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::drm::V1_2::OfflineLicenseState::UNKNOWN"
     },
     {
@@ -2415,11 +2486,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-949",
+   "self_type" : "type-949",
    "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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -2433,11 +2504,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/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-41",
+   "underlying_type" : "type-27",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -2459,8 +2530,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1094",
    "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-90",
@@ -2563,8 +2634,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2589,8 +2660,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2631,8 +2702,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2873,8 +2944,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-994",
-   "self_type" : "type-994",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -2903,8 +2974,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1001",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -2933,8 +3004,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -2975,8 +3046,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3013,8 +3084,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-2",
@@ -3039,8 +3110,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3057,8 +3128,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3087,8 +3158,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-2",
@@ -3181,8 +3252,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-992",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3223,8 +3294,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1000",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3241,8 +3312,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-2",
@@ -3271,8 +3342,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-2",
@@ -3305,8 +3376,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-993",
-   "self_type" : "type-993",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-2",
@@ -3359,8 +3430,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -3376,18 +3447,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-56"
-    },
-    {
-     "referenced_type" : "type-62"
-    },
-    {
      "referenced_type" : "type-42"
+    },
+    {
+     "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-55",
-   "return_type" : "type-53",
-   "self_type" : "type-55",
+   "referenced_type" : "type-41",
+   "return_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -3397,12 +3468,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-1021",
-   "return_type" : "type-41",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1072",
+   "return_type" : "type-27",
+   "self_type" : "type-1072",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -3412,27 +3483,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-884"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-981"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
-   "referenced_type" : "type-937",
-   "return_type" : "type-43",
-   "self_type" : "type-937",
+   "referenced_type" : "type-979",
+   "return_type" : "type-29",
+   "self_type" : "type-979",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -3445,14 +3516,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3462,16 +3533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3481,13 +3552,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1285"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3497,13 +3568,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1286"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3513,14 +3584,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3530,13 +3601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3546,13 +3617,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1236"
+     "referenced_type" : "type-1287"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3562,14 +3633,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3579,13 +3650,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-1288"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3595,10 +3666,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3608,10 +3679,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3620,13 +3691,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3636,10 +3707,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3649,16 +3720,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3667,14 +3738,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-211"
+     "referenced_type" : "type-216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3683,14 +3754,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-437"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3699,14 +3770,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3715,14 +3786,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
@@ -3733,13 +3804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-1242"
+     "referenced_type" : "type-1293"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3749,13 +3820,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3765,13 +3836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-420"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h"
   },
   {
@@ -3781,14 +3852,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3798,16 +3869,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3817,13 +3888,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1321"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3833,13 +3904,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1322"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3849,14 +3920,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3866,13 +3937,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3882,13 +3953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1323"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3898,14 +3969,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3915,13 +3986,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-1273"
+     "referenced_type" : "type-1324"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3931,10 +4002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3944,10 +4015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3956,13 +4027,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3972,10 +4043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -3985,16 +4056,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4003,14 +4074,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-234"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4019,14 +4090,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-240"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4035,14 +4106,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4051,14 +4122,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
@@ -4069,13 +4140,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-1277"
+     "referenced_type" : "type-1328"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4085,13 +4156,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4101,13 +4172,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h"
   },
   {
@@ -4117,16 +4188,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -4134,10 +4205,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-1331"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4148,13 +4219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-1281"
+     "referenced_type" : "type-1332"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4163,19 +4234,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1282"
+     "referenced_type" : "type-1333"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4184,19 +4255,40 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1283"
+     "referenced_type" : "type-1334"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BnHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1335"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4205,19 +4297,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1284"
+     "referenced_type" : "type-1336"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4226,19 +4318,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1285"
+     "referenced_type" : "type-1337"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4247,19 +4339,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1286"
+     "referenced_type" : "type-1338"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4268,19 +4360,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1287"
+     "referenced_type" : "type-1339"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4289,19 +4381,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-1340"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4312,10 +4404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4325,13 +4417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4341,13 +4433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     },
     {
-     "referenced_type" : "type-386"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4357,10 +4449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4370,10 +4462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4383,10 +4475,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-418"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h"
   },
   {
@@ -4396,13 +4488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1289"
+     "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4412,13 +4504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4428,16 +4520,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4447,13 +4539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-1342"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4463,16 +4555,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4482,13 +4574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4498,13 +4590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4514,13 +4606,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1343"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4530,13 +4622,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1292"
+     "referenced_type" : "type-1344"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4546,13 +4638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4562,28 +4654,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1294"
+     "referenced_type" : "type-1346"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4593,16 +4685,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1295"
+     "referenced_type" : "type-1347"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4612,13 +4704,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4628,13 +4720,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-1348"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4644,13 +4736,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1297"
+     "referenced_type" : "type-1349"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4660,16 +4752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1298"
+     "referenced_type" : "type-1350"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4679,19 +4771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4701,16 +4793,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-1299"
+     "referenced_type" : "type-1351"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4720,16 +4812,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4739,13 +4831,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1300"
+     "referenced_type" : "type-1352"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4755,16 +4847,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1301"
+     "referenced_type" : "type-1353"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4774,13 +4866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4790,13 +4882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1354"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4806,28 +4898,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1303"
+     "referenced_type" : "type-1355"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4837,28 +4929,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1304"
+     "referenced_type" : "type-1356"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4868,16 +4960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1305"
+     "referenced_type" : "type-1357"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4887,13 +4979,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4903,16 +4995,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4922,19 +5014,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1306"
+     "referenced_type" : "type-1358"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4944,13 +5036,35 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-598"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-425"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4960,16 +5074,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4979,13 +5093,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1307"
+     "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -4995,19 +5109,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1308"
+     "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5017,13 +5131,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1309"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5033,16 +5147,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1310"
+     "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5052,10 +5166,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5065,13 +5179,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5081,16 +5195,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5100,13 +5214,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5116,16 +5230,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5135,10 +5249,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5148,10 +5262,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5161,10 +5275,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5174,16 +5288,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-1363"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5192,16 +5306,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-1364"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5210,31 +5324,31 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1107"
     },
     {
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-523"
     },
     {
-     "referenced_type" : "type-1313"
+     "referenced_type" : "type-1365"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5244,19 +5358,43 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1366"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPlugin::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1219"
+    },
+    {
+     "referenced_type" : "type-1194"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5266,16 +5404,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1315"
+     "referenced_type" : "type-1367"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5284,16 +5422,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5302,16 +5440,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5321,13 +5459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1316"
+     "referenced_type" : "type-1368"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5336,19 +5474,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1369"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5357,22 +5495,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-1370"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5381,16 +5519,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1319"
+     "referenced_type" : "type-1371"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5400,10 +5538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5413,22 +5551,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-1372"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5438,16 +5576,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5457,25 +5595,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1321"
+     "referenced_type" : "type-1373"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5485,25 +5623,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1322"
+     "referenced_type" : "type-1374"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5513,25 +5651,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1323"
+     "referenced_type" : "type-1375"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5541,25 +5679,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1324"
+     "referenced_type" : "type-1376"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5569,19 +5707,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5591,13 +5729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5607,13 +5745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-409"
+     "referenced_type" : "type-425"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
@@ -5623,14 +5761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5640,16 +5778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5659,13 +5797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1325"
+     "referenced_type" : "type-1377"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5675,13 +5813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1326"
+     "referenced_type" : "type-1378"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5691,14 +5829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5708,13 +5846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5724,13 +5862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1327"
+     "referenced_type" : "type-1379"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5740,14 +5878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5757,13 +5895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-1328"
+     "referenced_type" : "type-1380"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5773,10 +5911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5786,10 +5924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5798,13 +5936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5814,10 +5952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5827,16 +5965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5845,14 +5983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-1268"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5861,14 +5999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5877,14 +6015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
@@ -5894,16 +6032,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -5911,10 +6049,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1329"
+     "referenced_type" : "type-1381"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5925,13 +6063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1382"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5940,19 +6078,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1331"
+     "referenced_type" : "type-1383"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5963,10 +6101,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5976,13 +6114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -5992,13 +6130,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     },
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-196"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6008,10 +6146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6021,10 +6159,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6034,10 +6172,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-202"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h"
   },
   {
@@ -6047,16 +6185,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6066,19 +6204,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-1332"
+     "referenced_type" : "type-1384"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6088,13 +6226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1333"
+     "referenced_type" : "type-1385"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6104,13 +6242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1334"
+     "referenced_type" : "type-1386"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6120,13 +6258,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6136,13 +6274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1335"
+     "referenced_type" : "type-1387"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6152,13 +6290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-1388"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6168,10 +6306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6181,10 +6319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6194,13 +6332,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6210,13 +6348,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6226,19 +6364,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6247,22 +6385,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     },
     {
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-101"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6272,10 +6410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6285,16 +6423,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6304,13 +6442,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6320,13 +6458,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
   {
@@ -6337,13 +6475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1340"
+     "referenced_type" : "type-1392"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6353,13 +6491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6369,13 +6507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-1213"
     },
     {
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h"
   },
   {
@@ -6385,14 +6523,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6402,16 +6540,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6421,13 +6559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-1396"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6437,13 +6575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1345"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6453,14 +6591,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6470,13 +6608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6486,13 +6624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1346"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6502,14 +6640,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6519,13 +6657,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-1347"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6535,10 +6673,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6548,10 +6686,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6560,13 +6698,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6576,10 +6714,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6589,16 +6727,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6611,10 +6749,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6623,14 +6761,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6639,14 +6777,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6655,14 +6793,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
@@ -6673,13 +6811,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1403"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6689,13 +6827,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6705,13 +6843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-1226"
     },
     {
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h"
   },
   {
@@ -6721,16 +6859,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -6738,10 +6876,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1406"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6752,13 +6890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1407"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6767,19 +6905,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1408"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6790,10 +6928,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6803,13 +6941,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6819,13 +6957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     },
     {
-     "referenced_type" : "type-1157"
+     "referenced_type" : "type-1208"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6835,10 +6973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6848,10 +6986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6861,10 +6999,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1159"
+     "referenced_type" : "type-1210"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h"
   },
   {
@@ -6874,40 +7012,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1357"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6917,16 +7055,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6936,13 +7074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6952,13 +7090,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1411"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6968,13 +7106,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -6984,13 +7122,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1412"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7000,7 +7138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
      "referenced_type" : "type-2"
@@ -7009,7 +7147,7 @@
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7018,43 +7156,43 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1413"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7064,13 +7202,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-1174",
+   "return_type" : "type-1227",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7080,13 +7218,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1414"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7096,16 +7234,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-875"
     },
     {
      "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7115,10 +7253,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7128,10 +7266,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7141,13 +7279,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-870"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7157,10 +7295,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7170,16 +7308,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7189,40 +7327,40 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1109"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-158"
     },
     {
-     "referenced_type" : "type-1220"
+     "referenced_type" : "type-1272"
     },
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-161"
     },
     {
      "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-167"
+     "referenced_type" : "type-172"
     },
     {
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7232,13 +7370,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7248,13 +7386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-1215"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
   {
@@ -7264,16 +7402,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7281,10 +7419,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7295,13 +7433,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7312,10 +7450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7325,13 +7463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7341,13 +7479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     },
     {
-     "referenced_type" : "type-1145"
+     "referenced_type" : "type-1197"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7357,10 +7495,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7370,10 +7508,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7383,10 +7521,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1106"
+     "referenced_type" : "type-1148"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h"
   },
   {
@@ -7396,16 +7534,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7415,19 +7553,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7437,13 +7575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1419"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7453,13 +7591,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1420"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7469,13 +7607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7485,13 +7623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7501,13 +7639,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1370"
+     "referenced_type" : "type-1422"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7517,10 +7655,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7530,10 +7668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7543,13 +7681,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-1178"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7559,10 +7697,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7572,16 +7710,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7591,13 +7729,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7607,13 +7745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
   {
@@ -7623,14 +7761,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7640,16 +7778,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7659,13 +7797,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1371"
+     "referenced_type" : "type-1423"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7675,13 +7813,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1424"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7691,14 +7829,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7708,13 +7846,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7724,13 +7862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1425"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7740,14 +7878,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7757,13 +7895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1426"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7773,10 +7911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7786,10 +7924,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7798,13 +7936,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-1091"
+     "referenced_type" : "type-1142"
     }
    ],
-   "return_type" : "type-53",
+   "return_type" : "type-39",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7814,10 +7952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7827,16 +7965,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7845,14 +7983,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-222"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7861,14 +7999,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-1216"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7877,14 +8015,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
@@ -7895,13 +8033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7911,13 +8049,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7927,13 +8065,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-601"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h"
   },
   {
@@ -7943,16 +8081,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
      "default_arg" : true,
@@ -7960,10 +8098,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7974,13 +8112,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BnHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS_4hidl4base4V1_08BnHwBaseERKNS0_6ParcelEPS9_NSt3__18functionIFvRS9_EEE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-987"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-1434"
+    }
+   ],
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -7989,19 +8148,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-987"
     },
     {
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-986"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-980"
     },
     {
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-41",
+   "return_type" : "type-27",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8012,10 +8171,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8025,13 +8184,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8041,13 +8200,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     },
     {
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8057,10 +8216,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8070,10 +8229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8083,10 +8242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-598"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h"
   },
   {
@@ -8096,16 +8255,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     },
     {
      "referenced_type" : "type-83"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8115,13 +8274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8131,13 +8290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8147,13 +8306,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-878"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-561",
+   "return_type" : "type-552",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8163,13 +8322,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8179,19 +8338,41 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-596"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-637"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8201,13 +8382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8217,16 +8398,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8236,13 +8417,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8252,10 +8433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8265,10 +8446,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener::_hidl_sendKeysChange_1_2",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener24_hidl_sendKeysChange_1_2EPNS0_10IInterfaceEPNS0_7details16HidlInstrumentorERKNS0_8hidl_vecIhEERKNS9_INS2_9KeyStatusEEEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1219"
+    },
+    {
+     "referenced_type" : "type-1194"
+    },
+    {
+     "referenced_type" : "type-919"
+    },
+    {
+     "referenced_type" : "type-524"
+    },
+    {
+     "referenced_type" : "type-39"
+    }
+   ],
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8277,16 +8482,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     },
     {
-     "referenced_type" : "type-1143"
+     "referenced_type" : "type-1194"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8296,10 +8501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8309,16 +8514,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-898"
+     "referenced_type" : "type-940"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1141"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8328,19 +8533,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1106"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-620",
+   "return_type" : "type-629",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8350,13 +8555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
@@ -8366,33 +8571,75 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-607"
+     "referenced_type" : "type-637"
     },
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-43",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
   {
+   "function_name" : "android::hardware::drm::V1_2::writeEmbeddedToParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_221writeEmbeddedToParcelERKNS2_9KeyStatusEPNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-980"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
+   "function_name" : "android::hardware::drm::V1_2::readEmbeddedFromParcel",
+   "linker_set_key" : "_ZN7android8hardware3drm4V1_222readEmbeddedFromParcelERKNS2_9KeyStatusERKNS0_6ParcelEjj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-389"
+    },
+    {
+     "referenced_type" : "type-986"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-27",
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/hwtypes.h"
+  },
+  {
    "function_name" : "android::hardware::details::castInterface",
    "linker_set_key" : "_ZN7android8hardware7details13castInterfaceINS0_3drm4V1_210IDrmPluginENS3_4V1_010IDrmPluginENS4_13BpHwDrmPluginEEENS0_6ReturnINS_2spIT_EEEENSA_IT0_EEPKcb",
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-210", "type-404" ]
+   "template_args" : [ "type-409", "type-215", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8400,18 +8647,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-385", "type-404" ]
+   "template_args" : [ "type-409", "type-410", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8419,18 +8666,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-430",
+   "return_type" : "type-447",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-384", "type-5", "type-404" ]
+   "template_args" : [ "type-409", "type-5", "type-421" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8438,18 +8685,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-190", "type-202" ]
+   "template_args" : [ "type-193", "type-195", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8457,18 +8704,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-189", "type-202" ]
+   "template_args" : [ "type-193", "type-194", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8476,18 +8723,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-241",
+   "return_type" : "type-246",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-188", "type-5", "type-202" ]
+   "template_args" : [ "type-193", "type-5", "type-207" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8495,18 +8742,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-133", "type-138" ]
+   "template_args" : [ "type-139", "type-140", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8514,18 +8761,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1180",
+   "return_type" : "type-1233",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-132", "type-5", "type-138" ]
+   "template_args" : [ "type-139", "type-5", "type-143" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8533,18 +8780,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-413", "type-1121" ]
+   "template_args" : [ "type-461", "type-417", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8552,18 +8799,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-439", "type-1121" ]
+   "template_args" : [ "type-461", "type-444", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8571,18 +8818,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-584",
+   "return_type" : "type-603",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-462", "type-5", "type-1121" ]
+   "template_args" : [ "type-461", "type-5", "type-1173" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8590,18 +8837,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-214", "type-602" ]
+   "template_args" : [ "type-623", "type-219", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -8609,18 +8856,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-617",
+   "return_type" : "type-648",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-593", "type-5", "type-602" ]
+   "template_args" : [ "type-623", "type-5", "type-632" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8628,12 +8875,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
-   "return_type" : "type-208",
+   "return_type" : "type-213",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-210", "type-43" ]
+   "template_args" : [ "type-215", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8641,12 +8888,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
-   "return_type" : "type-375",
+   "return_type" : "type-372",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-133", "type-43" ]
+   "template_args" : [ "type-140", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -8654,12 +8901,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
-   "return_type" : "type-212",
+   "return_type" : "type-217",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-214", "type-43" ]
+   "template_args" : [ "type-219", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8667,18 +8914,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-382",
+   "return_type" : "type-407",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-404", "type-384", "type-43", "type-43" ]
+   "template_args" : [ "type-421", "type-409", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8686,18 +8933,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-284"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-186",
+   "return_type" : "type-191",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-202", "type-188", "type-43", "type-43" ]
+   "template_args" : [ "type-207", "type-193", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8705,18 +8952,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1276"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-1155",
+   "return_type" : "type-1206",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-138", "type-132", "type-43", "type-43" ]
+   "template_args" : [ "type-143", "type-139", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8724,18 +8971,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-990"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-460",
+   "return_type" : "type-459",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-1121", "type-462", "type-43", "type-43" ]
+   "template_args" : [ "type-1173", "type-461", "type-29", "type-29" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -8743,18 +8990,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-689"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
-   "return_type" : "type-591",
+   "return_type" : "type-621",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-602", "type-593", "type-43", "type-43" ]
+   "template_args" : [ "type-632", "type-623", "type-29", "type-29" ]
   }
  ],
  "global_vars" :
@@ -8762,31 +9009,31 @@
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_210IDrmPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_211IDrmFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_213ICryptoPlugin10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_214ICryptoFactory10descriptorE",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener10descriptorE",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener::descriptor",
-   "referenced_type" : "type-69",
+   "referenced_type" : "type-55",
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   }
  ],
@@ -8796,8 +9043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -8805,8 +9052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -8814,8 +9061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-922",
+   "referenced_type" : "type-44",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -8823,8 +9070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-68",
-   "self_type" : "type-917",
+   "referenced_type" : "type-54",
+   "self_type" : "type-959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -8832,8 +9079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8841,8 +9088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &",
-   "referenced_type" : "type-584",
-   "self_type" : "type-589",
+   "referenced_type" : "type-603",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8850,8 +9097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8859,8 +9106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &",
-   "referenced_type" : "type-241",
-   "self_type" : "type-247",
+   "referenced_type" : "type-246",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8868,8 +9115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-434",
+   "referenced_type" : "type-447",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8877,8 +9124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &",
-   "referenced_type" : "type-617",
-   "self_type" : "type-621",
+   "referenced_type" : "type-648",
+   "self_type" : "type-655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8886,8 +9133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-561",
-   "self_type" : "type-580",
+   "referenced_type" : "type-552",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8895,8 +9142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-620",
-   "self_type" : "type-627",
+   "referenced_type" : "type-629",
+   "self_type" : "type-640",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8904,8 +9151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-243",
-   "self_type" : "type-550",
+   "referenced_type" : "type-248",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -8913,8 +9160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8922,8 +9169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
+   "referenced_type" : "type-280",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8931,8 +9178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8940,8 +9187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8949,8 +9196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8958,8 +9205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-942",
-   "self_type" : "type-941",
+   "referenced_type" : "type-984",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -8967,8 +9214,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-468",
-   "self_type" : "type-697",
+   "referenced_type" : "type-483",
+   "self_type" : "type-751",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8976,8 +9232,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-857",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8985,8 +9241,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-848",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -8994,8 +9250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-683",
+   "referenced_type" : "type-104",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9003,8 +9259,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus &",
    "name" : "android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-701",
+   "referenced_type" : "type-486",
+   "self_type" : "type-754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "android::hardware::drm::V1_2::KeyStatus &",
+   "referenced_type" : "type-123",
+   "self_type" : "type-614",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9012,8 +9277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-860",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-902",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9021,8 +9286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-829",
-   "self_type" : "type-834",
+   "referenced_type" : "type-871",
+   "self_type" : "type-876",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9031,7 +9296,7 @@
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
    "referenced_type" : "type-80",
-   "self_type" : "type-1132",
+   "self_type" : "type-1183",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9039,8 +9304,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-467",
-   "self_type" : "type-647",
+   "referenced_type" : "type-482",
+   "self_type" : "type-672",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-507",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9048,8 +9322,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-856",
-   "self_type" : "type-867",
+   "referenced_type" : "type-898",
+   "self_type" : "type-909",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9057,8 +9331,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-847",
-   "self_type" : "type-855",
+   "referenced_type" : "type-889",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9066,8 +9340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-645",
+   "referenced_type" : "type-103",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9075,8 +9349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-380",
+   "referenced_type" : "type-372",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9084,8 +9358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-220",
+   "referenced_type" : "type-213",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9093,8 +9367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-212",
-   "self_type" : "type-414",
+   "referenced_type" : "type-217",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9102,8 +9376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-460",
-   "self_type" : "type-479",
+   "referenced_type" : "type-459",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9111,8 +9385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9120,8 +9394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-186",
-   "self_type" : "type-239",
+   "referenced_type" : "type-191",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9129,8 +9403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-426",
+   "referenced_type" : "type-407",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9138,8 +9412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-591",
-   "self_type" : "type-613",
+   "referenced_type" : "type-621",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9147,8 +9421,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-490",
-   "self_type" : "type-501",
+   "referenced_type" : "type-496",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9156,8 +9430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -9165,8 +9439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-913",
-   "self_type" : "type-916",
+   "referenced_type" : "type-955",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -9174,8 +9448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-985",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -9183,8 +9457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-599",
+   "referenced_type" : "type-584",
+   "self_type" : "type-609",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9192,8 +9466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-537",
+   "referenced_type" : "type-537",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -9201,8 +9475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9210,8 +9484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer &",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-167",
+   "referenced_type" : "type-162",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9219,8 +9493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus &",
    "name" : "const android::hardware::drm::V1_0::KeyStatus &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9228,8 +9502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue &",
    "name" : "const android::hardware::drm::V1_0::KeyValue &",
-   "referenced_type" : "type-464",
-   "self_type" : "type-578",
+   "referenced_type" : "type-479",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9237,8 +9511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern &",
    "name" : "const android::hardware::drm::V1_0::Pattern &",
-   "referenced_type" : "type-151",
-   "self_type" : "type-153",
+   "referenced_type" : "type-156",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9246,8 +9520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer &",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -9255,8 +9529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-111",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9264,8 +9538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9273,8 +9547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value &",
-   "referenced_type" : "type-169",
-   "self_type" : "type-168",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9282,17 +9556,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease &",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-574",
+   "referenced_type" : "type-597",
+   "self_type" : "type-598",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus &",
+   "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 android::hardware::hidl_array<unsigned char, 16> &",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> &",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1178",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -9300,8 +9583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-897",
-   "self_type" : "type-898",
+   "referenced_type" : "type-939",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9309,8 +9592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-833",
+   "referenced_type" : "type-874",
+   "self_type" : "type-875",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9318,8 +9601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-828",
+   "referenced_type" : "type-868",
+   "self_type" : "type-870",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9327,8 +9610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> &",
-   "referenced_type" : "type-571",
-   "self_type" : "type-572",
+   "referenced_type" : "type-595",
+   "self_type" : "type-596",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -9336,8 +9619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-503",
+   "referenced_type" : "type-480",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9345,8 +9628,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> &",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9354,8 +9637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> &",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9363,8 +9646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9372,17 +9655,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> &",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1260",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> &",
+   "referenced_type" : "type-509",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "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-1089",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9390,8 +9682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-502",
+   "referenced_type" : "type-504",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -9399,8 +9691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-874",
+   "referenced_type" : "type-914",
+   "self_type" : "type-916",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9408,8 +9700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> &",
    "name" : "const android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
+   "referenced_type" : "type-917",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9417,8 +9709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-892",
-   "self_type" : "type-894",
+   "referenced_type" : "type-934",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -9426,8 +9718,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-968",
-   "self_type" : "type-969",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1011",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -9435,8 +9727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-49",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -9444,7 +9736,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> &",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -9453,8 +9745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &",
-   "referenced_type" : "type-401",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-405",
+   "self_type" : "type-1268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9462,8 +9754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> &",
-   "referenced_type" : "type-228",
-   "self_type" : "type-229",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9471,8 +9763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> &",
-   "referenced_type" : "type-207",
-   "self_type" : "type-211",
+   "referenced_type" : "type-212",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9480,8 +9772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-217",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9489,8 +9781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-445",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9498,8 +9790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> &",
-   "referenced_type" : "type-234",
-   "self_type" : "type-235",
+   "referenced_type" : "type-239",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9507,8 +9799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> &",
-   "referenced_type" : "type-421",
-   "self_type" : "type-422",
+   "referenced_type" : "type-436",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9516,8 +9808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9525,8 +9817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9534,8 +9826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-191",
+   "referenced_type" : "type-190",
+   "self_type" : "type-196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9543,8 +9835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-386",
+   "referenced_type" : "type-406",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9552,8 +9844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &",
-   "referenced_type" : "type-590",
-   "self_type" : "type-594",
+   "referenced_type" : "type-620",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9561,8 +9853,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-507",
-   "self_type" : "type-810",
+   "referenced_type" : "type-515",
+   "self_type" : "type-852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9570,8 +9862,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-862",
-   "self_type" : "type-878",
+   "referenced_type" : "type-904",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9579,8 +9871,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-1164",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -9588,8 +9880,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-364",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-369",
+   "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -9597,8 +9889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1184",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9606,8 +9898,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-1147",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9615,8 +9907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-296",
-   "self_type" : "type-802",
+   "referenced_type" : "type-297",
+   "self_type" : "type-844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9624,8 +9916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-818",
-   "self_type" : "type-819",
+   "referenced_type" : "type-860",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9633,8 +9925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-816",
-   "self_type" : "type-817",
+   "referenced_type" : "type-858",
+   "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9642,59 +9934,59 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-999",
-   "self_type" : "type-998",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1043",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-446",
-   "self_type" : "type-448",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
+   "referenced_type" : "type-661",
+   "self_type" : "type-663",
    "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-769",
+   "self_type" : "type-771",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-841",
+   "referenced_type" : "type-881",
+   "self_type" : "type-883",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-484",
+   "referenced_type" : "type-391",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -9702,8 +9994,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
+   "referenced_type" : "type-854",
+   "self_type" : "type-855",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9711,8 +10003,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-806",
-   "self_type" : "type-807",
+   "referenced_type" : "type-848",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9720,8 +10012,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-803",
-   "self_type" : "type-805",
+   "referenced_type" : "type-845",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9729,8 +10021,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-1222",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9738,8 +10030,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-275",
-   "self_type" : "type-277",
+   "referenced_type" : "type-282",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9747,8 +10039,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-504",
-   "self_type" : "type-508",
+   "referenced_type" : "type-525",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9756,8 +10048,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-687",
+   "self_type" : "type-689",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9765,8 +10057,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-946",
-   "self_type" : "type-948",
+   "referenced_type" : "type-988",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -9774,8 +10066,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9783,8 +10075,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9792,8 +10084,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-182",
+   "referenced_type" : "type-188",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9801,8 +10093,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-378",
-   "self_type" : "type-377",
+   "referenced_type" : "type-402",
+   "self_type" : "type-401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9810,8 +10102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-587",
-   "self_type" : "type-705",
+   "referenced_type" : "type-617",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9819,8 +10111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9828,8 +10120,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-885",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-927",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -9837,8 +10129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-811",
+   "referenced_type" : "type-37",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9846,8 +10138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-815",
+   "referenced_type" : "type-856",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9855,8 +10147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-808",
-   "self_type" : "type-809",
+   "referenced_type" : "type-850",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -9864,8 +10156,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-41",
-   "self_type" : "type-909",
+   "referenced_type" : "type-27",
+   "self_type" : "type-951",
    "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"
   },
@@ -9874,7 +10166,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1047",
+   "self_type" : "type-1098",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -9883,7 +10175,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-2",
-   "self_type" : "type-1060",
+   "self_type" : "type-1111",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   }
@@ -9894,8 +10186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-298",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -9903,8 +10195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-33",
+   "self_type" : "type-1076",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9912,8 +10204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -9921,8 +10213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9930,8 +10222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9939,8 +10231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -9949,7 +10241,7 @@
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
    "referenced_type" : "type-6",
-   "self_type" : "type-824",
+   "self_type" : "type-866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9957,8 +10249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9966,8 +10258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-251",
-   "self_type" : "type-250",
+   "referenced_type" : "type-256",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9975,8 +10267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9984,8 +10276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-628",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -9993,8 +10285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10020,8 +10312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-821",
+   "referenced_type" : "type-862",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10029,8 +10321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -10038,8 +10330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-923",
+   "referenced_type" : "type-44",
+   "self_type" : "type-965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -10047,8 +10339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-918",
+   "referenced_type" : "type-54",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -10056,8 +10348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-296",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10065,8 +10357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-633",
-   "self_type" : "type-657",
+   "referenced_type" : "type-643",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -10074,8 +10366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-510",
+   "referenced_type" : "type-200",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10083,8 +10375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-974",
+   "self_type" : "type-973",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10092,8 +10384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10101,8 +10393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-272",
+   "referenced_type" : "type-210",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10110,8 +10402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-498",
+   "referenced_type" : "type-424",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -10119,17 +10411,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-651",
+   "referenced_type" : "type-635",
+   "self_type" : "type-683",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.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-991",
+   "self_type" : "type-1034",
+   "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-999",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "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-962",
-   "self_type" : "type-967",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1009",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10137,8 +10447,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-981",
-   "self_type" : "type-987",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10146,8 +10456,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-970",
-   "self_type" : "type-976",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -10155,8 +10465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-845",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10164,8 +10474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10182,8 +10492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-147",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10191,8 +10501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-933",
-   "self_type" : "type-938",
+   "referenced_type" : "type-975",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -10200,8 +10510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-39",
+   "referenced_type" : "type-26",
+   "self_type" : "type-25",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10209,8 +10519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10218,8 +10528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
+   "referenced_type" : "type-603",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10227,8 +10537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10236,8 +10546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-245",
+   "referenced_type" : "type-246",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10245,8 +10555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-431",
+   "referenced_type" : "type-447",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10254,8 +10564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-618",
+   "referenced_type" : "type-648",
+   "self_type" : "type-649",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10263,8 +10573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-561",
-   "self_type" : "type-575",
+   "referenced_type" : "type-552",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10272,8 +10582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-624",
+   "referenced_type" : "type-629",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10281,17 +10591,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-243",
-   "self_type" : "type-523",
+   "referenced_type" : "type-248",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.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-1032",
+   "self_type" : "type-1035",
+   "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-1036",
+   "self_type" : "type-1038",
+   "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-1039",
+   "self_type" : "type-1040",
+   "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-146",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-151",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10299,8 +10636,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-468",
-   "self_type" : "type-696",
+   "referenced_type" : "type-483",
+   "self_type" : "type-750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10308,8 +10654,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-857",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1185",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10317,8 +10663,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-848",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1179",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10326,8 +10672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-672",
+   "referenced_type" : "type-104",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10335,8 +10681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-606",
+   "referenced_type" : "type-247",
+   "self_type" : "type-610",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -10344,8 +10690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory *",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1157",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h"
   },
@@ -10353,8 +10699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1097",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1150",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h"
   },
@@ -10362,8 +10708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-352",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h"
   },
@@ -10371,8 +10717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-338",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h"
   },
@@ -10380,8 +10726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-331",
+   "referenced_type" : "type-338",
+   "self_type" : "type-339",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h"
   },
@@ -10389,8 +10735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-417",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10398,8 +10744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-376",
+   "referenced_type" : "type-140",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10407,8 +10753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-226",
+   "referenced_type" : "type-195",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10416,8 +10762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-215",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10425,8 +10771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-219",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10434,8 +10780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus *",
    "name" : "android::hardware::drm::V1_0::KeyStatus *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10443,8 +10789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue *",
    "name" : "android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10452,8 +10798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop *",
    "name" : "android::hardware::drm::V1_0::SecureStop *",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-494",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10461,8 +10807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample *",
    "name" : "android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10470,8 +10816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h"
   },
@@ -10479,8 +10825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-355",
+   "referenced_type" : "type-359",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h"
   },
@@ -10488,8 +10834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin *",
-   "referenced_type" : "type-562",
-   "self_type" : "type-563",
+   "referenced_type" : "type-585",
+   "self_type" : "type-586",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h"
   },
@@ -10498,7 +10844,7 @@
    "linker_set_key" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "name" : "android::hardware::drm::V1_1::DrmMetricGroup *",
    "referenced_type" : "type-74",
-   "self_type" : "type-367",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10533,8 +10879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-439",
-   "self_type" : "type-438",
+   "referenced_type" : "type-444",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10542,8 +10888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-232",
+   "referenced_type" : "type-194",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10551,8 +10897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-385",
-   "self_type" : "type-418",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10560,8 +10906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory *",
-   "referenced_type" : "type-986",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10569,8 +10915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10578,8 +10924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-197",
+   "referenced_type" : "type-197",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10587,8 +10933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-399",
+   "referenced_type" : "type-414",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10596,8 +10942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
+   "referenced_type" : "type-627",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10605,8 +10951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10614,8 +10960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-143",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10623,8 +10969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-206",
+   "referenced_type" : "type-207",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10632,8 +10978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-404",
-   "self_type" : "type-409",
+   "referenced_type" : "type-421",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10641,8 +10987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-607",
+   "referenced_type" : "type-632",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10650,8 +10996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory *",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10659,8 +11005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10668,8 +11014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory *",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-201",
+   "referenced_type" : "type-203",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10677,8 +11023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-419",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10686,8 +11032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-601",
+   "referenced_type" : "type-630",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10695,8 +11041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10704,8 +11050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-139",
+   "self_type" : "type-1207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10713,8 +11059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
+   "referenced_type" : "type-193",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10722,8 +11068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-409",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10731,17 +11077,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-123",
+   "self_type" : "type-386",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-886",
-   "self_type" : "type-888",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10749,8 +11104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10758,8 +11113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-491",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10767,8 +11122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-501",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -10776,8 +11131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "referenced_type" : "type-871",
+   "self_type" : "type-872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10786,7 +11141,7 @@
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
    "referenced_type" : "type-80",
-   "self_type" : "type-850",
+   "self_type" : "type-892",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10794,8 +11149,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-646",
+   "referenced_type" : "type-482",
+   "self_type" : "type-671",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-507",
+   "self_type" : "type-675",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10803,8 +11167,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-856",
-   "self_type" : "type-864",
+   "referenced_type" : "type-898",
+   "self_type" : "type-906",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10812,8 +11176,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-847",
-   "self_type" : "type-852",
+   "referenced_type" : "type-889",
+   "self_type" : "type-894",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10821,8 +11185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-370",
+   "referenced_type" : "type-103",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -10830,8 +11194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-891",
+   "referenced_type" : "type-932",
+   "self_type" : "type-933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -10839,8 +11203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-945",
+   "referenced_type" : "type-198",
+   "self_type" : "type-987",
    "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"
   },
@@ -10857,8 +11221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
+   "referenced_type" : "type-270",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10866,8 +11230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10884,8 +11248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-29",
+   "referenced_type" : "type-16",
+   "self_type" : "type-21",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10893,8 +11257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-260",
+   "referenced_type" : "type-24",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10902,8 +11266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-416",
+   "referenced_type" : "type-415",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10911,8 +11275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10920,8 +11284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
+   "referenced_type" : "type-230",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10929,8 +11293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-219",
+   "referenced_type" : "type-213",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10938,8 +11302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10947,8 +11311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-440",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10956,8 +11320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10965,8 +11329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-433",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10974,8 +11338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10983,8 +11347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -10992,8 +11356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-237",
+   "referenced_type" : "type-191",
+   "self_type" : "type-242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11001,8 +11365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-424",
+   "referenced_type" : "type-407",
+   "self_type" : "type-439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11010,8 +11374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-591",
-   "self_type" : "type-611",
+   "referenced_type" : "type-621",
+   "self_type" : "type-644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11019,8 +11383,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-490",
-   "self_type" : "type-489",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11028,8 +11392,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-194",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11037,8 +11401,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-265",
-   "self_type" : "type-278",
+   "referenced_type" : "type-268",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11046,8 +11410,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-352",
-   "self_type" : "type-363",
+   "referenced_type" : "type-335",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11055,8 +11419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-975",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11064,8 +11428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-517",
-   "self_type" : "type-625",
+   "referenced_type" : "type-528",
+   "self_type" : "type-638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11073,8 +11437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-827",
+   "referenced_type" : "type-499",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11083,7 +11447,7 @@
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "referenced_type" : "type-3",
-   "self_type" : "type-1144",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11091,8 +11455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -11100,8 +11464,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
+   "referenced_type" : "type-41",
+   "self_type" : "type-40",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -11109,8 +11473,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-609",
+   "referenced_type" : "type-57",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -11118,8 +11482,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-905",
+   "referenced_type" : "type-946",
+   "self_type" : "type-947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -11127,8 +11491,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-864",
+   "self_type" : "type-865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11136,8 +11500,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-921",
+   "referenced_type" : "type-43",
+   "self_type" : "type-963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11145,8 +11509,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-915",
+   "referenced_type" : "type-955",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11154,8 +11518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -11163,8 +11527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-925",
-   "self_type" : "type-926",
+   "referenced_type" : "type-967",
+   "self_type" : "type-968",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -11172,8 +11536,8 @@
    "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-955",
-   "self_type" : "type-956",
+   "referenced_type" : "type-997",
+   "self_type" : "type-998",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11181,8 +11545,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-961",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1003",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -11190,8 +11554,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status> *",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11199,8 +11563,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11208,8 +11572,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11217,8 +11581,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-249",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11226,8 +11590,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > *",
-   "referenced_type" : "type-435",
-   "self_type" : "type-436",
+   "referenced_type" : "type-451",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11235,8 +11599,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
+   "referenced_type" : "type-656",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11244,8 +11608,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-583",
+   "referenced_type" : "type-584",
+   "self_type" : "type-599",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11253,8 +11617,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-558",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11262,8 +11626,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-698",
-   "self_type" : "type-699",
+   "referenced_type" : "type-752",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11271,8 +11635,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
+   "referenced_type" : "type-600",
+   "self_type" : "type-601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11280,8 +11644,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-181",
+   "referenced_type" : "type-181",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11289,8 +11653,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-136",
+   "referenced_type" : "type-125",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11298,8 +11662,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-175",
+   "referenced_type" : "type-179",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11307,8 +11671,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-171",
+   "referenced_type" : "type-175",
+   "self_type" : "type-176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-387",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11316,8 +11689,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11325,8 +11698,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-1129",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1182",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11334,8 +11707,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-373",
+   "referenced_type" : "type-381",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11343,8 +11716,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11352,8 +11725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1127",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11361,8 +11734,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-614",
+   "referenced_type" : "type-619",
+   "self_type" : "type-625",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11370,8 +11743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory *",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -11379,8 +11752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -11388,8 +11761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "referenced_type" : "type-357",
+   "self_type" : "type-358",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -11397,8 +11770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-343",
+   "referenced_type" : "type-350",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -11406,8 +11779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener *",
-   "referenced_type" : "type-335",
-   "self_type" : "type-336",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -11415,8 +11788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -11424,8 +11797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11433,8 +11806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-317",
+   "referenced_type" : "type-321",
+   "self_type" : "type-322",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -11442,8 +11815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin *",
-   "referenced_type" : "type-223",
-   "self_type" : "type-224",
+   "referenced_type" : "type-228",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11451,8 +11824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-315",
+   "referenced_type" : "type-319",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -11460,8 +11833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue *",
    "name" : "const android::hardware::drm::V1_0::KeyValue *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11469,8 +11842,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample *",
    "name" : "const android::hardware::drm::V1_0::SubSample *",
-   "referenced_type" : "type-1200",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11478,8 +11851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -11487,8 +11860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-365",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -11496,8 +11869,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
+   "referenced_type" : "type-590",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -11505,8 +11878,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -11514,8 +11887,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-319",
+   "referenced_type" : "type-323",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -11523,8 +11896,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
+   "referenced_type" : "type-570",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -11532,8 +11905,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory *",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -11541,8 +11914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-150",
+   "referenced_type" : "type-142",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -11550,8 +11923,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -11559,8 +11932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin *",
-   "referenced_type" : "type-569",
-   "self_type" : "type-570",
+   "referenced_type" : "type-593",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -11568,8 +11941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
+   "referenced_type" : "type-746",
+   "self_type" : "type-748",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -11577,8 +11950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory *",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory *",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -11586,8 +11959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-134",
+   "referenced_type" : "type-138",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -11595,8 +11968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory *",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
+   "referenced_type" : "type-333",
+   "self_type" : "type-334",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -11604,8 +11977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin *",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin *",
-   "referenced_type" : "type-559",
-   "self_type" : "type-560",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -11613,17 +11986,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-692",
+   "referenced_type" : "type-743",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-508",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 16> *",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11631,8 +12013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11640,8 +12022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-832",
-   "self_type" : "type-836",
+   "referenced_type" : "type-874",
+   "self_type" : "type-878",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11649,8 +12031,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus> *",
-   "referenced_type" : "type-571",
-   "self_type" : "type-648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11658,8 +12040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-466",
+   "referenced_type" : "type-480",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11667,8 +12049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11676,8 +12058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute> *",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11685,8 +12067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric> *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11694,8 +12076,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus> *",
+   "referenced_type" : "type-509",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11703,8 +12094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> > *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11712,8 +12103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-914",
+   "self_type" : "type-915",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11721,8 +12112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-876",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11730,8 +12121,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-892",
-   "self_type" : "type-893",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11739,8 +12130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1147",
    "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"
   },
@@ -11748,8 +12139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11757,8 +12148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-288",
+   "referenced_type" : "type-290",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11766,8 +12157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1093",
    "size" : 4,
    "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"
   },
@@ -11775,8 +12166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-49",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11784,8 +12175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-264",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11793,7 +12184,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory> *",
-   "referenced_type" : "type-420",
+   "referenced_type" : "type-427",
    "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -11802,8 +12193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-400",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11811,8 +12202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory> *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11820,8 +12211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin> *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-222",
+   "referenced_type" : "type-212",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11829,8 +12220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-218",
+   "referenced_type" : "type-221",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11838,8 +12229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory> *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-451",
+   "referenced_type" : "type-453",
+   "self_type" : "type-455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11847,8 +12238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory> *",
-   "referenced_type" : "type-234",
-   "self_type" : "type-236",
+   "referenced_type" : "type-239",
+   "self_type" : "type-241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11856,8 +12247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin> *",
-   "referenced_type" : "type-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-436",
+   "self_type" : "type-438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11865,8 +12256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11874,8 +12265,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11883,8 +12274,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory> *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-240",
+   "referenced_type" : "type-190",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11892,8 +12283,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-427",
+   "referenced_type" : "type-406",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11901,8 +12292,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener> *",
-   "referenced_type" : "type-590",
-   "self_type" : "type-615",
+   "referenced_type" : "type-620",
+   "self_type" : "type-647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11910,8 +12301,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-507",
-   "self_type" : "type-506",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11919,8 +12310,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-862",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-904",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11928,8 +12319,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-1164",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11937,8 +12328,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-283",
-   "self_type" : "type-286",
+   "referenced_type" : "type-281",
+   "self_type" : "type-285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11946,8 +12337,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-364",
-   "self_type" : "type-371",
+   "referenced_type" : "type-369",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11955,8 +12346,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11964,8 +12355,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-838",
-   "self_type" : "type-851",
+   "referenced_type" : "type-880",
+   "self_type" : "type-893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11973,8 +12364,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-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -11982,8 +12373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "referenced_type" : "type-56",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11991,8 +12382,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12000,7 +12391,7 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-388",
+   "referenced_type" : "type-391",
    "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -12009,8 +12400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12018,8 +12409,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12027,8 +12418,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-814",
-   "self_type" : "type-939",
+   "referenced_type" : "type-856",
+   "self_type" : "type-981",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12036,8 +12427,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-896",
+   "referenced_type" : "type-937",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12045,8 +12436,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -12054,8 +12445,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-871",
+   "referenced_type" : "type-27",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12063,8 +12454,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-582",
+   "referenced_type" : "type-392",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12072,8 +12463,8 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-644",
+   "referenced_type" : "type-170",
+   "self_type" : "type-654",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12082,7 +12473,7 @@
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-90",
-   "self_type" : "type-104",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12091,7 +12482,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1221",
+   "self_type" : "type-1273",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12100,7 +12491,7 @@
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
    "referenced_type" : "type-83",
-   "self_type" : "type-935",
+   "self_type" : "type-977",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12108,8 +12499,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-979",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12117,8 +12508,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-29",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12126,8 +12517,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-42",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-28",
+   "self_type" : "type-1075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -12139,8 +12530,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12149,8 +12540,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-250",
-   "self_type" : "type-252",
+   "referenced_type" : "type-255",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12159,8 +12550,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-441",
-   "self_type" : "type-443",
+   "referenced_type" : "type-456",
+   "self_type" : "type-462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12169,8 +12560,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
+   "referenced_type" : "type-658",
+   "self_type" : "type-660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12179,8 +12570,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-714",
-   "self_type" : "type-716",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12199,8 +12590,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-144",
+   "referenced_type" : "type-17",
+   "self_type" : "type-149",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12209,8 +12600,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-643",
-   "self_type" : "type-904",
+   "referenced_type" : "type-653",
+   "self_type" : "type-946",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -12220,7 +12611,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-6",
-   "self_type" : "type-822",
+   "self_type" : "type-864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12229,8 +12620,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
+   "referenced_type" : "type-44",
+   "self_type" : "type-43",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12239,8 +12630,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-68",
-   "self_type" : "type-913",
+   "referenced_type" : "type-54",
+   "self_type" : "type-955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12249,8 +12640,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-50",
-   "self_type" : "type-990",
+   "referenced_type" : "type-36",
+   "self_type" : "type-1041",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -12259,8 +12650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-143",
-   "self_type" : "type-925",
+   "referenced_type" : "type-148",
+   "self_type" : "type-967",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -12269,8 +12660,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-949",
-   "self_type" : "type-955",
+   "referenced_type" : "type-991",
+   "self_type" : "type-997",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12279,8 +12670,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-957",
-   "self_type" : "type-960",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1002",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12289,8 +12680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-933",
-   "self_type" : "type-943",
+   "referenced_type" : "type-975",
+   "self_type" : "type-985",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12299,8 +12690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::drm::V1_0::Status>",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1231",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12309,8 +12700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
-   "referenced_type" : "type-584",
-   "self_type" : "type-595",
+   "referenced_type" : "type-603",
+   "self_type" : "type-607",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12319,8 +12710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1237",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12329,8 +12720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
-   "referenced_type" : "type-241",
-   "self_type" : "type-248",
+   "referenced_type" : "type-246",
+   "self_type" : "type-253",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12339,8 +12730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-435",
+   "referenced_type" : "type-447",
+   "self_type" : "type-451",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12349,8 +12740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
-   "referenced_type" : "type-617",
-   "self_type" : "type-622",
+   "referenced_type" : "type-648",
+   "self_type" : "type-656",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12359,8 +12750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-581",
+   "referenced_type" : "type-552",
+   "self_type" : "type-584",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12369,8 +12760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-243",
-   "self_type" : "type-526",
+   "referenced_type" : "type-248",
+   "self_type" : "type-537",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12379,8 +12770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-952",
-   "self_type" : "type-954",
+   "referenced_type" : "type-994",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12389,8 +12780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-698",
+   "referenced_type" : "type-483",
+   "self_type" : "type-752",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12399,8 +12790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-576",
+   "referenced_type" : "type-474",
+   "self_type" : "type-600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12409,8 +12800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12420,7 +12811,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-85",
-   "self_type" : "type-135",
+   "self_type" : "type-125",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12430,7 +12821,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-76",
-   "self_type" : "type-174",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12440,7 +12831,17 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-93",
-   "self_type" : "type-170",
+   "self_type" : "type-175",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12449,8 +12850,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-857",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-899",
+   "self_type" : "type-1187",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12459,8 +12860,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-848",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-890",
+   "self_type" : "type-1181",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12469,8 +12870,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-372",
+   "referenced_type" : "type-378",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12479,8 +12880,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-869",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-911",
+   "self_type" : "type-1062",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12489,8 +12890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-104",
+   "self_type" : "type-1117",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12499,8 +12900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-242",
-   "self_type" : "type-610",
+   "referenced_type" : "type-247",
+   "self_type" : "type-619",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12509,8 +12910,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1162",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h"
   },
@@ -12519,8 +12920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1154",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h"
   },
@@ -12529,8 +12930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-349",
+   "referenced_type" : "type-354",
+   "self_type" : "type-357",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h"
   },
@@ -12539,8 +12940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-342",
+   "referenced_type" : "type-347",
+   "self_type" : "type-350",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h"
   },
@@ -12549,8 +12950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-335",
+   "referenced_type" : "type-340",
+   "self_type" : "type-343",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h"
   },
@@ -12559,8 +12960,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::BufferType",
    "name" : "const android::hardware::drm::V1_0::BufferType",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1118",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12569,8 +12970,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "const android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12579,8 +12980,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::EventType",
    "name" : "const android::hardware::drm::V1_0::EventType",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12589,8 +12990,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-417",
+   "self_type" : "type-1134",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h"
   },
@@ -12599,8 +13000,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-408",
+   "referenced_type" : "type-140",
+   "self_type" : "type-411",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12609,8 +13010,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmFactory",
    "name" : "const android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-316",
+   "referenced_type" : "type-195",
+   "self_type" : "type-321",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h"
   },
@@ -12619,8 +13020,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-223",
+   "referenced_type" : "type-215",
+   "self_type" : "type-228",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12629,8 +13030,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-314",
+   "referenced_type" : "type-219",
+   "self_type" : "type-319",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h"
   },
@@ -12639,8 +13040,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyRequestType",
    "name" : "const android::hardware::drm::V1_0::KeyRequestType",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12649,8 +13050,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatus",
    "name" : "const android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-703",
+   "referenced_type" : "type-486",
+   "self_type" : "type-756",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12659,8 +13060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyStatusType",
    "name" : "const android::hardware::drm::V1_0::KeyStatusType",
-   "referenced_type" : "type-472",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-487",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12669,8 +13070,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyType",
    "name" : "const android::hardware::drm::V1_0::KeyType",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12679,8 +13080,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::KeyValue",
    "name" : "const android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-464",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12689,8 +13090,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Mode",
    "name" : "const android::hardware::drm::V1_0::Mode",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12699,8 +13100,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Pattern",
    "name" : "const android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-157",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12709,8 +13110,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SharedBuffer",
    "name" : "const android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12719,8 +13120,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::Status",
    "name" : "const android::hardware::drm::V1_0::Status",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -12729,8 +13130,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_0::SubSample",
    "name" : "const android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-185",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12739,8 +13140,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1169",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h"
   },
@@ -12749,8 +13150,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-359",
+   "referenced_type" : "type-361",
+   "self_type" : "type-365",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h"
   },
@@ -12759,8 +13160,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-567",
+   "referenced_type" : "type-587",
+   "self_type" : "type-590",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h"
   },
@@ -12770,7 +13171,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Attribute",
    "referenced_type" : "type-88",
-   "self_type" : "type-112",
+   "self_type" : "type-100",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12780,7 +13181,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Metric",
    "referenced_type" : "type-79",
-   "self_type" : "type-173",
+   "self_type" : "type-178",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12790,7 +13191,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::Value",
    "referenced_type" : "type-96",
-   "self_type" : "type-169",
+   "self_type" : "type-174",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12800,7 +13201,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "name" : "const android::hardware::drm::V1_1::DrmMetricGroup::ValueType",
    "referenced_type" : "type-89",
-   "self_type" : "type-105",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12810,7 +13211,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::HdcpLevel",
    "name" : "const android::hardware::drm::V1_1::HdcpLevel",
    "referenced_type" : "type-97",
-   "self_type" : "type-106",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12819,8 +13220,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-444",
+   "self_type" : "type-1136",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h"
   },
@@ -12829,8 +13230,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmFactory",
    "name" : "const android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-318",
+   "referenced_type" : "type-194",
+   "self_type" : "type-323",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h"
   },
@@ -12839,8 +13240,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-549",
+   "referenced_type" : "type-410",
+   "self_type" : "type-570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h"
   },
@@ -12850,7 +13251,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_1::KeyRequestType",
    "name" : "const android::hardware::drm::V1_1::KeyRequestType",
    "referenced_type" : "type-98",
-   "self_type" : "type-107",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12859,8 +13260,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "const android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-573",
+   "referenced_type" : "type-102",
+   "self_type" : "type-597",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12869,8 +13270,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_1::SecurityLevel",
    "name" : "const android::hardware::drm::V1_1::SecurityLevel",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -12879,8 +13280,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -12889,8 +13290,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-143",
+   "self_type" : "type-142",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h"
   },
@@ -12899,8 +13300,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-361",
+   "referenced_type" : "type-207",
+   "self_type" : "type-367",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h"
   },
@@ -12909,8 +13310,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-569",
+   "referenced_type" : "type-421",
+   "self_type" : "type-593",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -12919,8 +13320,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-694",
+   "referenced_type" : "type-632",
+   "self_type" : "type-746",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h"
   },
@@ -12930,7 +13331,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::HdcpLevel",
    "name" : "const android::hardware::drm::V1_2::HdcpLevel",
    "referenced_type" : "type-121",
-   "self_type" : "type-124",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -12939,8 +13340,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "const android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-461",
+   "self_type" : "type-1138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -12949,8 +13350,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "const android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-131",
+   "referenced_type" : "type-139",
+   "self_type" : "type-138",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h"
   },
@@ -12959,8 +13360,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmFactory",
    "name" : "const android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-328",
+   "referenced_type" : "type-193",
+   "self_type" : "type-333",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h"
   },
@@ -12969,8 +13370,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "const android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-559",
+   "referenced_type" : "type-409",
+   "self_type" : "type-581",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h"
   },
@@ -12979,18 +13380,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "const android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-690",
+   "referenced_type" : "type-623",
+   "self_type" : "type-743",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatus",
+   "name" : "const android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-390",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "name" : "const android::hardware::drm::V1_2::KeyStatusType",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "name" : "const android::hardware::drm::V1_2::OfflineLicenseState",
    "referenced_type" : "type-119",
-   "self_type" : "type-122",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13000,7 +13421,7 @@
    "linker_set_key" : "const android::hardware::drm::V1_2::Status",
    "name" : "const android::hardware::drm::V1_2::Status",
    "referenced_type" : "type-120",
-   "self_type" : "type-123",
+   "self_type" : "type-126",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -13009,8 +13430,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 16>",
    "name" : "const android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-928",
+   "self_type" : "type-1177",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h"
   },
@@ -13019,8 +13440,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-501",
+   "self_type" : "type-1200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13029,8 +13450,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-897",
+   "referenced_type" : "type-165",
+   "self_type" : "type-939",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13039,8 +13460,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-832",
+   "referenced_type" : "type-871",
+   "self_type" : "type-874",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13050,7 +13471,7 @@
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
    "referenced_type" : "type-80",
-   "self_type" : "type-826",
+   "self_type" : "type-868",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13059,8 +13480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-571",
+   "referenced_type" : "type-482",
+   "self_type" : "type-595",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h"
   },
@@ -13069,8 +13490,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-465",
+   "referenced_type" : "type-473",
+   "self_type" : "type-480",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13079,8 +13500,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13090,7 +13511,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
    "referenced_type" : "type-84",
-   "self_type" : "type-1203",
+   "self_type" : "type-1254",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13100,7 +13521,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
    "referenced_type" : "type-75",
-   "self_type" : "type-1209",
+   "self_type" : "type-1261",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13110,7 +13531,17 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
    "referenced_type" : "type-92",
-   "self_type" : "type-1206",
+   "self_type" : "type-1257",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "const android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13119,8 +13550,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-847",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-889",
+   "self_type" : "type-1140",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h"
   },
@@ -13129,8 +13560,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13139,8 +13570,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-872",
+   "referenced_type" : "type-910",
+   "self_type" : "type-914",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13149,8 +13580,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-875",
+   "referenced_type" : "type-103",
+   "self_type" : "type-917",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13159,8 +13590,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13169,8 +13600,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-1092",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1146",
    "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"
   },
@@ -13179,8 +13610,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-907",
-   "self_type" : "type-908",
+   "referenced_type" : "type-949",
+   "self_type" : "type-950",
    "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"
   },
@@ -13190,7 +13621,7 @@
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
    "referenced_type" : "type-5",
-   "self_type" : "type-966",
+   "self_type" : "type-1008",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13199,8 +13630,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-965",
-   "self_type" : "type-968",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1010",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13209,8 +13640,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-267",
-   "self_type" : "type-287",
+   "referenced_type" : "type-270",
+   "self_type" : "type-290",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13219,8 +13650,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-1044",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1099",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -13229,8 +13660,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-1043",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1097",
    "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"
   },
@@ -13239,8 +13670,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-354",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-337",
+   "self_type" : "type-1092",
    "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"
   },
@@ -13249,8 +13680,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-20",
-   "self_type" : "type-63",
+   "referenced_type" : "type-16",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
   },
@@ -13259,8 +13690,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-38",
-   "self_type" : "type-261",
+   "referenced_type" : "type-24",
+   "self_type" : "type-266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13269,8 +13700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-420",
+   "referenced_type" : "type-415",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13279,8 +13710,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-401",
+   "referenced_type" : "type-372",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13289,8 +13720,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmFactory>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13299,8 +13730,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
+   "referenced_type" : "type-213",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13309,8 +13740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-216",
+   "referenced_type" : "type-217",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13319,8 +13750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-444",
+   "referenced_type" : "type-442",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13329,8 +13760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmFactory>",
-   "referenced_type" : "type-231",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13339,8 +13770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-421",
+   "referenced_type" : "type-433",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13349,8 +13780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-486",
+   "referenced_type" : "type-459",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13359,8 +13790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13369,8 +13800,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmFactory>",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
+   "referenced_type" : "type-191",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13379,8 +13810,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-407",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13389,8 +13820,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "const android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-621",
+   "self_type" : "type-620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13399,8 +13830,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-490",
-   "self_type" : "type-507",
+   "referenced_type" : "type-496",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13409,8 +13840,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-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-905",
+   "self_type" : "type-904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13419,8 +13850,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-194",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-199",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13429,8 +13860,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-265",
-   "self_type" : "type-283",
+   "referenced_type" : "type-268",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13439,8 +13870,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-352",
-   "self_type" : "type-364",
+   "referenced_type" : "type-335",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13449,8 +13880,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-931",
+   "self_type" : "type-1161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13459,8 +13890,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-493",
-   "self_type" : "type-838",
+   "referenced_type" : "type-499",
+   "self_type" : "type-880",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13470,7 +13901,7 @@
    "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-3",
-   "self_type" : "type-1147",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13479,8 +13910,8 @@
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-296",
+   "referenced_type" : "type-39",
+   "self_type" : "type-297",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13489,8 +13920,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13499,8 +13930,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13510,7 +13941,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-91",
-   "self_type" : "type-818",
+   "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13519,8 +13950,8 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-792",
-   "self_type" : "type-816",
+   "referenced_type" : "type-834",
+   "self_type" : "type-858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13529,8 +13960,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-999",
+   "referenced_type" : "type-27",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13538,48 +13969,48 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
+   "referenced_type" : "type-259",
+   "self_type" : "type-258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "source_file" : "/system/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-770",
+   "self_type" : "type-769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-840",
-   "self_type" : "type-839",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13587,8 +14018,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13597,8 +14028,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-46",
-   "self_type" : "type-812",
+   "referenced_type" : "type-32",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13607,8 +14038,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13617,8 +14048,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-713",
-   "self_type" : "type-806",
+   "referenced_type" : "type-730",
+   "self_type" : "type-848",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13627,8 +14058,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13637,8 +14068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13647,8 +14078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13657,8 +14088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-560",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13667,8 +14098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-723",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13677,8 +14108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-73",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13687,8 +14118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
    "name" : "const std::array<android::hardware::drm::V1_0::BufferType, 2>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13697,8 +14128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13707,8 +14138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13717,8 +14148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13727,8 +14158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-527",
+   "referenced_type" : "type-63",
+   "self_type" : "type-62",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13737,8 +14168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13747,8 +14178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::EventType, 5>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13757,8 +14188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13767,8 +14198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-312",
+   "self_type" : "type-311",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13777,8 +14208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13787,8 +14218,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13797,8 +14228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-717",
+   "self_type" : "type-716",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13807,8 +14238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyRequestType, 4>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13817,8 +14248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13827,8 +14258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13837,8 +14268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
+   "referenced_type" : "type-556",
+   "self_type" : "type-555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13847,8 +14278,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-69",
+   "self_type" : "type-68",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13857,8 +14288,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13867,8 +14298,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyStatusType, 5>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-742",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13877,8 +14308,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13887,8 +14318,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-27",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13897,8 +14328,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13907,8 +14338,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-529",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13917,8 +14348,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-715",
+   "self_type" : "type-714",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13927,8 +14358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_0::KeyType, 3>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13937,8 +14368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13947,8 +14378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13957,8 +14388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13967,8 +14398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-536",
-   "self_type" : "type-535",
+   "referenced_type" : "type-71",
+   "self_type" : "type-70",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13977,8 +14408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13987,8 +14418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
    "name" : "const std::array<android::hardware::drm::V1_0::Mode, 4>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-745",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -13997,8 +14428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14007,8 +14438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-23",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14017,8 +14448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14027,8 +14458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-524",
+   "referenced_type" : "type-61",
+   "self_type" : "type-60",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14037,8 +14468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14047,8 +14478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
    "name" : "const std::array<android::hardware::drm::V1_0::Status, 13>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h"
   },
@@ -14057,8 +14488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
+   "referenced_type" : "type-112",
+   "self_type" : "type-111",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14067,8 +14498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14077,8 +14508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-542",
-   "self_type" : "type-541",
+   "referenced_type" : "type-562",
+   "self_type" : "type-561",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14087,8 +14518,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
    "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_1::DrmMetricGroup::ValueType, 3>",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14107,8 +14548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-328",
+   "self_type" : "type-327",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14117,8 +14558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-544",
-   "self_type" : "type-543",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14127,8 +14568,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
    "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "name" : "const std::array<android::hardware::drm::V1_1::HdcpLevel, 7>",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14147,8 +14598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14157,8 +14608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-545",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14167,8 +14618,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::KeyRequestType, 6>",
+   "referenced_type" : "type-807",
+   "self_type" : "type-806",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14187,8 +14648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-332",
+   "self_type" : "type-331",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14197,8 +14658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14207,8 +14668,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
    "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-734",
+   "self_type" : "type-733",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_1::SecurityLevel, 6>",
+   "referenced_type" : "type-809",
+   "self_type" : "type-808",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h"
   },
@@ -14217,38 +14688,88 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
    "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-134",
+   "self_type" : "type-133",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 32,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-137",
+   "self_type" : "type-136",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "name" : "const std::array<android::hardware::drm::V1_2::KeyStatusType, 6>",
+   "referenced_type" : "type-818",
+   "self_type" : "type-817",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "referenced_type" : "type-130",
    "self_type" : "type-129",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "name" : "const std::array<android::hardware::drm::V1_2::HdcpLevel, 8>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 32,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14257,8 +14778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-574",
+   "self_type" : "type-573",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14267,8 +14788,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
    "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-736",
+   "self_type" : "type-735",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "name" : "const std::array<android::hardware::drm::V1_2::OfflineLicenseState, 3>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14277,8 +14808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
+   "referenced_type" : "type-132",
+   "self_type" : "type-131",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14287,8 +14818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14297,8 +14828,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
    "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "name" : "const std::array<android::hardware::drm::V1_2::Status, 17>",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h"
   },
@@ -14307,8 +14848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1265",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14317,8 +14858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14327,8 +14868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14337,8 +14878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-680",
+   "self_type" : "type-679",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14347,8 +14888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14357,8 +14898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14367,8 +14908,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-1052",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14377,8 +14918,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-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-23",
+   "self_type" : "type-22",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14387,8 +14928,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-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14397,8 +14938,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-522",
-   "self_type" : "type-521",
+   "referenced_type" : "type-544",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14407,8 +14948,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-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-707",
+   "self_type" : "type-706",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14417,8 +14958,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-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14427,8 +14968,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-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14437,8 +14978,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-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14447,8 +14988,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-520",
-   "self_type" : "type-519",
+   "referenced_type" : "type-542",
+   "self_type" : "type-541",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14457,8 +14998,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-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-705",
+   "self_type" : "type-704",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -14467,8 +15008,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-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1274",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14477,8 +15018,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-276",
-   "self_type" : "type-275",
+   "referenced_type" : "type-283",
+   "self_type" : "type-282",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14487,8 +15028,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-505",
-   "self_type" : "type-504",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14497,8 +15038,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-688",
+   "self_type" : "type-687",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14507,8 +15048,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-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -14517,8 +15058,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-1197",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14527,8 +15068,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-259",
-   "self_type" : "type-258",
+   "referenced_type" : "type-265",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14537,8 +15078,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-453",
-   "self_type" : "type-452",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14547,8 +15088,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-640",
-   "self_type" : "type-639",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14557,8 +15098,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-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14567,8 +15108,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-1195",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14577,8 +15118,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-257",
-   "self_type" : "type-256",
+   "referenced_type" : "type-262",
+   "self_type" : "type-261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14587,8 +15128,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-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14597,8 +15138,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-638",
-   "self_type" : "type-637",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14607,8 +15148,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-854",
-   "self_type" : "type-853",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14617,8 +15158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14627,8 +15168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14637,8 +15178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-184",
-   "self_type" : "type-183",
+   "referenced_type" : "type-189",
+   "self_type" : "type-188",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14647,8 +15188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
+   "referenced_type" : "type-403",
+   "self_type" : "type-402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14657,8 +15198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-618",
+   "self_type" : "type-617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14667,8 +15208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14678,7 +15219,7 @@
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
    "referenced_type" : "type-90",
-   "self_type" : "type-885",
+   "self_type" : "type-927",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14688,7 +15229,7 @@
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-2",
-   "self_type" : "type-51",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14698,7 +15239,7 @@
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
    "referenced_type" : "type-83",
-   "self_type" : "type-814",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14707,8 +15248,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-393",
-   "self_type" : "type-808",
+   "referenced_type" : "type-396",
+   "self_type" : "type-850",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14716,8 +15257,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-43",
-   "self_type" : "type-895",
+   "referenced_type" : "type-29",
+   "self_type" : "type-937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -14725,8 +15266,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-53",
-   "self_type" : "type-299",
+   "referenced_type" : "type-39",
+   "self_type" : "type-300",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -14735,8 +15276,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-41",
-   "self_type" : "type-72",
+   "referenced_type" : "type-27",
+   "self_type" : "type-58",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -14750,14 +15291,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -14769,17 +15310,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-51"
     }
    ],
    "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-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-58", "type-20" ],
+   "template_args" : [ "type-44", "type-16" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -14789,37 +15330,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
+     "referenced_type" : "type-652"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
+   "name" : "android::LightRefBase<android::NativeHandle>",
+   "record_kind" : "class",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-653" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
      "referenced_type" : "type-642"
     }
    ],
-   "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
-   "name" : "android::LightRefBase<android::NativeHandle>",
+   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
+   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
    "referenced_type" : "type-641",
    "self_type" : "type-641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "template_args" : [ "type-643" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-632"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-633" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -14829,14 +15370,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-34"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -14848,14 +15389,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1026"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -14865,7 +15406,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-651"
     }
    ],
    "fields" :
@@ -14874,20 +15415,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -14899,14 +15440,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1083"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -14918,14 +15459,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -14937,14 +15478,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-1086"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -15015,8 +15556,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-867",
+   "self_type" : "type-867",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -15026,8 +15567,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -15059,8 +15600,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -15071,17 +15612,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-52"
     }
    ],
    "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-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-67" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -15128,14 +15669,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -15193,14 +15734,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-45"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -15212,14 +15753,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -15239,62 +15780,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-297"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-298"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-300"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-294"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -15384,17 +15925,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-52" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -15441,7 +15982,7 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
@@ -15453,20 +15994,20 @@
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -15518,14 +16059,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-641"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-643",
+   "self_type" : "type-643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -15553,7 +16094,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -15562,32 +16103,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -15703,7 +16244,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-149"
     },
     {
      "access" : "private",
@@ -15715,14 +16256,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-150"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -15810,23 +16351,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_014ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -15999,23 +16540,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_013ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -16200,23 +16741,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_011IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -16393,23 +16934,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_010IDrmPluginEEE",
    "vtable_components" :
    [
@@ -16686,23 +17227,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_018IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -16879,23 +17420,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-930",
-   "self_type" : "type-930",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_114ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17068,23 +17609,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_111IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -17261,23 +17802,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_110IDrmPluginEEE",
    "vtable_components" :
    [
@@ -17594,23 +18135,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-932",
-   "self_type" : "type-932",
+   "referenced_type" : "type-974",
+   "self_type" : "type-974",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_214ICryptoFactoryEEE",
    "vtable_components" :
    [
@@ -17783,23 +18324,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_213ICryptoPluginEEE",
    "vtable_components" :
    [
@@ -17988,23 +18529,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_211IDrmFactoryEEE",
    "vtable_components" :
    [
@@ -18185,23 +18726,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEEE",
    "vtable_components" :
    [
@@ -18438,6 +18979,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -18546,23 +19091,23 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::hardware::BpInterface<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-635",
+   "self_type" : "type-635",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEEE",
    "vtable_components" :
    [
@@ -18635,6 +19180,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -18746,17 +19295,17 @@
      "referenced_type" : "type-5"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-147"
     },
     {
-     "referenced_type" : "type-143"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "name" : "android::hardware::BpInterface<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 32,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "template_args" : [ "type-5" ],
@@ -18926,23 +19475,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-950"
+     "referenced_type" : "type-992"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-993"
     }
    ],
    "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-949",
-   "self_type" : "type-949",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-952" ],
+   "template_args" : [ "type-3", "type-994" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -18952,23 +19501,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-958"
+     "referenced_type" : "type-1000"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-1001"
     }
    ],
    "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-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-999",
+   "self_type" : "type-999",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-3", "type-53" ],
+   "template_args" : [ "type-3", "type-39" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -18978,23 +19527,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-1005"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-964"
+     "referenced_type" : "type-1006"
     }
    ],
    "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-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1004",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-965", "type-889" ],
+   "template_args" : [ "type-1007", "type-931" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -19004,23 +19553,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-982"
+     "referenced_type" : "type-1024"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-983"
+     "referenced_type" : "type-1025"
     }
    ],
    "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-981",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-984", "type-985" ],
+   "template_args" : [ "type-1026", "type-1027" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -19030,23 +19579,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-971"
+     "referenced_type" : "type-1013"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-1014"
     }
    ],
    "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-970",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-973", "type-974" ],
+   "template_args" : [ "type-1015", "type-1016" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -19075,8 +19624,8 @@
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -19087,7 +19636,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-829"
+     "referenced_type" : "type-871"
     },
     {
      "is_virtual" : true,
@@ -19097,8 +19646,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-879",
+   "self_type" : "type-879",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -19185,8 +19734,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -19390,8 +19939,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -19473,13 +20022,13 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-842"
+     "referenced_type" : "type-884"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-943"
     },
     {
      "access" : "private",
@@ -19496,11 +20045,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-942",
+   "self_type" : "type-942",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
@@ -19516,19 +20065,19 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-976"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "access" : "private",
@@ -19552,7 +20101,7 @@
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-977"
     },
     {
      "access" : "private",
@@ -19582,38 +20131,38 @@
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 448,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 456,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 464,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-978"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-933",
-   "self_type" : "type-933",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -19640,8 +20189,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-940",
-   "self_type" : "type-940",
+   "referenced_type" : "type-982",
+   "self_type" : "type-982",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -19661,25 +20210,25 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-30"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-31"
     },
     {
      "access" : "private",
@@ -19697,86 +20246,86 @@
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-33"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-49"
+     "referenced_type" : "type-35"
     },
     {
      "access" : "private",
      "field_name" : "mManagesContexts",
      "field_offset" : 480,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-40"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-54"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolStarted",
      "field_offset" : 768,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSpawnThreadOnStart",
      "field_offset" : 776,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-37"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-59"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -19854,7 +20403,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     },
     {
      "field_name" : "refs",
@@ -19864,8 +20413,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -19875,7 +20424,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19884,17 +20433,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1104" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_3drm4V1_06StatusEEE"
   },
   {
@@ -19902,7 +20451,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19911,17 +20460,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-603",
+   "self_type" : "type-603",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-460" ],
+   "template_args" : [ "type-459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_214ICryptoFactoryEEEEE"
   },
   {
@@ -19929,7 +20478,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19938,17 +20487,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1155" ],
+   "template_args" : [ "type-1206" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_213ICryptoPluginEEEEE"
   },
   {
@@ -19956,7 +20505,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19965,17 +20514,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> >",
    "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-186" ],
+   "template_args" : [ "type-191" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_211IDrmFactoryEEEEE"
   },
   {
@@ -19983,7 +20532,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -19992,17 +20541,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> >",
    "record_kind" : "class",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-382" ],
+   "template_args" : [ "type-407" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_210IDrmPluginEEEEE"
   },
   {
@@ -20010,7 +20559,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -20019,17 +20568,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-591" ],
+   "template_args" : [ "type-621" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_3drm4V1_218IDrmPluginListenerEEEEE"
   },
   {
@@ -20037,7 +20586,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "fields" :
@@ -20046,17 +20595,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-552",
+   "self_type" : "type-552",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -20064,17 +20613,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -20084,26 +20633,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-249"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -20113,34 +20662,94 @@
    "fields" :
    [
     {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1032",
+   "self_type" : "type-1032",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-991" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1036",
+   "self_type" : "type-1036",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-999" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "buffer",
+     "referenced_type" : "type-1033"
+    }
+   ],
+   "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-1039",
+   "self_type" : "type-1039",
+   "size" : 16,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
+   "template_args" : [ "type-1004" ],
+   "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-152"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-153"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-154"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -20169,18 +20778,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -20192,14 +20801,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -20208,8 +20817,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-784",
+   "self_type" : "type-784",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -20218,8 +20827,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -20228,8 +20837,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -20249,8 +20858,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(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<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Attribute>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-86",
    "self_type" : "type-86",
@@ -20265,7 +20874,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-377"
     },
     {
      "field_name" : "_pad",
@@ -20273,11 +20882,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(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<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<DrmMetricGroup>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_114DrmMetricGroupEEUt_E"
@@ -20289,7 +20898,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "_pad",
@@ -20297,11 +20906,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(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<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-886",
+   "self_type" : "type-886",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -20313,7 +20922,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-386"
     },
     {
      "field_name" : "_pad",
@@ -20321,11 +20930,35 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(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<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEUt_E"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "mPointer",
+     "referenced_type" : "type-485"
+    },
+    {
+     "field_name" : "_pad",
+     "referenced_type" : "type-83"
+    }
+   ],
+   "is_anonymous" : true,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyStatus>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "record_kind" : "union",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEUt_E"
@@ -20337,7 +20970,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
@@ -20345,11 +20978,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(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<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<KeyValue>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEUt_E"
@@ -20369,8 +21002,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(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<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Metric>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-77",
    "self_type" : "type-77",
@@ -20385,7 +21018,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-493"
     },
     {
      "field_name" : "_pad",
@@ -20393,11 +21026,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(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<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SecureStop>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-492",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEUt_E"
@@ -20409,7 +21042,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-184"
     },
     {
      "field_name" : "_pad",
@@ -20417,11 +21050,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(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<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<SubSample>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEUt_E"
@@ -20441,8 +21074,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(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<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<Value>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-94",
    "self_type" : "type-94",
@@ -20456,16 +21089,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-886"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-885",
+   "self_type" : "type-885",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -20474,16 +21107,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-484"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -20492,16 +21125,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-456"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -20510,16 +21143,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -20528,16 +21161,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-178"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -20600,13 +21233,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-74" ],
@@ -20618,16 +21251,34 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-858"
+     "referenced_type" : "type-385"
+    }
+   ],
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-900"
     }
    ],
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-899",
+   "self_type" : "type-899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -20636,13 +21287,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-849"
+     "referenced_type" : "type-891"
     }
    ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-890",
+   "self_type" : "type-890",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-80" ],
@@ -20654,16 +21305,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-379"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEE"
   },
   {
@@ -20672,16 +21323,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-881"
+     "referenced_type" : "type-923"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -20691,7 +21342,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-609"
+     "referenced_type" : "type-615"
     },
     {
      "field_name" : "_pad",
@@ -20699,11 +21350,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-923",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -20723,7 +21374,7 @@
    "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-56" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -20733,7 +21384,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-55"
     },
     {
      "field_name" : "_pad",
@@ -20741,8 +21392,8 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-82",
    "self_type" : "type-82",
@@ -20756,16 +21407,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-162"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-164" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -20775,7 +21426,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "_pad",
@@ -20783,11 +21434,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -20799,7 +21450,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-901"
     },
     {
      "field_name" : "_pad",
@@ -20807,11 +21458,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h: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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -20823,7 +21474,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-850"
+     "referenced_type" : "type-892"
     },
     {
      "field_name" : "_pad",
@@ -20831,11 +21482,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -20847,7 +21498,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-380"
     },
     {
      "field_name" : "_pad",
@@ -20855,11 +21506,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned 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<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_vec<unsigned char> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8hidl_vecIhEEEUt_E"
@@ -20870,16 +21521,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-912"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -20889,7 +21540,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-871"
+     "referenced_type" : "type-913"
     },
     {
      "field_name" : "_pad",
@@ -20897,11 +21548,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-912",
+   "self_type" : "type-912",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -20912,16 +21563,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-944"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-943",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-165" ],
+   "template_args" : [ "type-170" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -20931,7 +21582,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-654"
     },
     {
      "field_name" : "_pad",
@@ -20939,11 +21590,11 @@
     }
    ],
    "is_anonymous" : true,
-   "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",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -20954,13 +21605,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-90" ],
@@ -20973,7 +21624,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "_pad",
@@ -20981,11 +21632,11 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -20994,8 +21645,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-763",
+   "self_type" : "type-763",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -21007,20 +21658,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -21029,8 +21680,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 16>",
    "name" : "android::hardware::details::std_array<unsigned char, 16>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-924",
+   "self_type" : "type-924",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -21040,8 +21691,8 @@
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-925",
+   "self_type" : "type-925",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -21052,7 +21703,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21061,13 +21712,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-415"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoFactory",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1104",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1156",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BnHwCryptoFactoryE",
@@ -21189,7 +21840,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21198,13 +21849,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-372"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwCryptoPlugin",
-   "referenced_type" : "type-1097",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1149",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BnHwCryptoPluginE",
@@ -21326,7 +21977,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21335,13 +21986,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BnHwDrmFactory",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BnHwDrmFactoryE",
@@ -21463,7 +22114,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21472,13 +22123,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-213"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPlugin",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BnHwDrmPluginE",
@@ -21600,7 +22251,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -21609,13 +22260,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-217"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BnHwDrmPluginListener",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BnHwDrmPluginListenerE",
@@ -21737,10 +22388,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-971"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -21749,19 +22400,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1108"
+     "referenced_type" : "type-1159"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1109"
+     "referenced_type" : "type-1160"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoFactory",
-   "referenced_type" : "type-1107",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1158",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017BpHwCryptoFactoryE",
@@ -21950,10 +22601,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-928"
+     "referenced_type" : "type-970"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -21962,19 +22613,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1152"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1153"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwCryptoPlugin",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_016BpHwCryptoPluginE",
@@ -22172,10 +22823,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-275"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22184,19 +22835,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_0::BpHwDrmFactory",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014BpHwDrmFactoryE",
@@ -22388,10 +23039,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-274"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22400,19 +23051,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPlugin",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013BpHwDrmPluginE",
@@ -22679,10 +23330,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-273"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -22691,19 +23342,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-341"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::BpHwDrmPluginListener",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_021BpHwDrmPluginListenerE",
@@ -22896,23 +23547,23 @@
    [
     {
      "field_name" : "type",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-164"
     },
     {
      "field_name" : "nonsecureMemory",
      "field_offset" : 64,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-160"
     },
     {
      "field_name" : "secureMemory",
      "field_offset" : 256,
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::DestinationBuffer",
    "name" : "android::hardware::drm::V1_0::DestinationBuffer",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 48,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_017DestinationBufferE"
@@ -22927,8 +23578,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoFactory",
    "name" : "android::hardware::drm::V1_0::ICryptoFactory",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_014ICryptoFactoryE",
@@ -23050,8 +23701,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_0::ICryptoPlugin",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_013ICryptoPluginE",
@@ -23185,8 +23836,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmFactory",
    "name" : "android::hardware::drm::V1_0::IDrmFactory",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_011IDrmFactoryE",
@@ -23312,8 +23963,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPlugin",
    "name" : "android::hardware::drm::V1_0::IDrmPlugin",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010IDrmPluginE",
@@ -23539,8 +24190,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_0::IDrmPluginListener",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_018IDrmPluginListenerE",
@@ -23662,18 +24313,18 @@
    [
     {
      "field_name" : "keyId",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     },
     {
      "field_name" : "type",
      "field_offset" : 128,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-487"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyStatus",
    "name" : "android::hardware::drm::V1_0::KeyStatus",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09KeyStatusE"
@@ -23694,8 +24345,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::KeyValue",
    "name" : "android::hardware::drm::V1_0::KeyValue",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 32,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_08KeyValueE"
@@ -23716,8 +24367,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::Pattern",
    "name" : "android::hardware::drm::V1_0::Pattern",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_07PatternE"
@@ -23728,13 +24379,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SecureStop",
    "name" : "android::hardware::drm::V1_0::SecureStop",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_010SecureStopE"
@@ -23760,8 +24411,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SharedBuffer",
    "name" : "android::hardware::drm::V1_0::SharedBuffer",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_012SharedBufferE"
@@ -23782,8 +24433,8 @@
    ],
    "linker_set_key" : "android::hardware::drm::V1_0::SubSample",
    "name" : "android::hardware::drm::V1_0::SubSample",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.0/android.hardware.drm@1.0_genc++_headers/gen/android/hardware/drm/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_09SubSampleE"
@@ -23793,7 +24444,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23802,13 +24453,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-442"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BnHwCryptoFactory",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1164",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BnHwCryptoFactoryE",
@@ -23930,7 +24581,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -23939,13 +24590,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BnHwDrmFactory",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BnHwDrmFactoryE",
@@ -24067,7 +24718,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -24076,13 +24727,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BnHwDrmPlugin",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-585",
+   "self_type" : "type-585",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BnHwDrmPluginE",
@@ -24204,10 +24855,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-972"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24216,19 +24867,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1115"
+     "referenced_type" : "type-1167"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1116"
+     "referenced_type" : "type-1168"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_1::BpHwCryptoFactory",
-   "referenced_type" : "type-1114",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117BpHwCryptoFactoryE",
@@ -24417,10 +25068,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-277"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24429,19 +25080,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_1::BpHwDrmFactory",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114BpHwDrmFactoryE",
@@ -24633,10 +25284,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-497"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -24645,19 +25296,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_1::BpHwDrmPlugin",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_113BpHwDrmPluginE",
@@ -24982,7 +25633,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -25046,7 +25697,7 @@
     {
      "field_name" : "int64Value",
      "field_offset" : 192,
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "doubleValue",
@@ -25072,13 +25723,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-417"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::ICryptoFactory",
    "name" : "android::hardware::drm::V1_1::ICryptoFactory",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_114ICryptoFactoryE",
@@ -25195,13 +25846,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-190"
+     "referenced_type" : "type-195"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmFactory",
    "name" : "android::hardware::drm::V1_1::IDrmFactory",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_111IDrmFactoryE",
@@ -25322,13 +25973,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-215"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::IDrmPlugin",
    "name" : "android::hardware::drm::V1_1::IDrmPlugin",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_110IDrmPluginE",
@@ -25590,13 +26241,13 @@
    [
     {
      "field_name" : "opaqueData",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_1::SecureStopRelease",
    "name" : "android::hardware::drm::V1_1::SecureStopRelease",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.1/android.hardware.drm@1.1_genc++_headers/gen/android/hardware/drm/1.1/types.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_117SecureStopReleaseE"
@@ -25606,7 +26257,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25615,13 +26266,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-459"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoFactory",
-   "referenced_type" : "type-986",
-   "self_type" : "type-986",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1028",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BnHwCryptoFactoryE",
@@ -25743,7 +26394,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25752,13 +26403,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-1206"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwCryptoPlugin",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BnHwCryptoPluginE",
@@ -25880,7 +26531,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -25889,13 +26540,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-191"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BnHwDrmFactory",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BnHwDrmFactoryE",
@@ -26017,7 +26668,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26026,13 +26677,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-382"
+     "referenced_type" : "type-407"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPlugin",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BnHwDrmPluginE",
@@ -26154,7 +26805,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26163,13 +26814,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-621"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BnHwDrmPluginListener",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BnHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BnHwDrmPluginListenerE",
@@ -26291,10 +26942,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-932"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26303,19 +26954,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1122"
+     "referenced_type" : "type-1174"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1123"
+     "referenced_type" : "type-1175"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoFactory",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_217BpHwCryptoFactoryE",
@@ -26504,10 +27155,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-146"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26516,19 +27167,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwCryptoPlugin",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_216BpHwCryptoPluginE",
@@ -26729,10 +27380,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26741,19 +27392,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-208"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmFactory",
    "name" : "android::hardware::drm::V1_2::BpHwDrmFactory",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BpHwDrmFactoryE",
@@ -26948,10 +27599,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -26960,19 +27611,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-422"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-423"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPlugin",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213BpHwDrmPluginE",
@@ -27166,6 +27817,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_213BpHwDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_210IDrmPluginEE10onAsBinderEv"
     },
     {
@@ -27290,10 +27944,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-635"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27302,19 +27956,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-603"
+     "referenced_type" : "type-633"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-634"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BpHwDrmPluginListener",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-632",
+   "self_type" : "type-632",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BpHwDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_221BpHwDrmPluginListenerE",
@@ -27385,6 +28039,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_221BpHwDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "mangled_component_name" : "_ZN7android8hardware11BpInterfaceINS0_3drm4V1_218IDrmPluginListenerEE10onAsBinderEv"
     },
     {
@@ -27509,10 +28166,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-461"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27521,19 +28178,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-489"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoFactory",
    "name" : "android::hardware::drm::V1_2::BsCryptoFactory",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1220",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_215BsCryptoFactoryE",
@@ -27664,10 +28321,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-139"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27676,19 +28333,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-1154"
+     "referenced_type" : "type-1205"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsCryptoPlugin",
    "name" : "android::hardware::drm::V1_2::BsCryptoPlugin",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsCryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214BsCryptoPluginE",
@@ -27831,10 +28488,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-193"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -27843,19 +28500,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-185"
+     "referenced_type" : "type-190"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmFactory",
    "name" : "android::hardware::drm::V1_2::BsDrmFactory",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_212BsDrmFactoryE",
@@ -27992,10 +28649,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-409"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28004,19 +28661,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-406"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPlugin",
    "name" : "android::hardware::drm::V1_2::BsDrmPlugin",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211BsDrmPluginE",
@@ -28210,6 +28867,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_211BsDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -28276,10 +28936,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -28288,19 +28948,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-620"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::BsDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::BsDrmPluginListener",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/BsDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_219BsDrmPluginListenerE",
@@ -28371,6 +29031,9 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_219BsDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "component_value" : -4,
      "kind" : "offset_to_top"
     },
@@ -28437,13 +29100,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-444"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoFactory",
    "name" : "android::hardware::drm::V1_2::ICryptoFactory",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_214ICryptoFactoryE",
@@ -28560,13 +29223,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::ICryptoPlugin",
    "name" : "android::hardware::drm::V1_2::ICryptoPlugin",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/ICryptoPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_213ICryptoPluginE",
@@ -28699,13 +29362,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmFactory",
    "name" : "android::hardware::drm::V1_2::IDrmFactory",
-   "referenced_type" : "type-188",
-   "self_type" : "type-188",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmFactory.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_211IDrmFactoryE",
@@ -28830,13 +29493,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-410"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPlugin",
    "name" : "android::hardware::drm::V1_2::IDrmPlugin",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPlugin.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_210IDrmPluginE",
@@ -29075,6 +29738,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_210IDrmPlugin18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29125,13 +29792,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-219"
     }
    ],
    "linker_set_key" : "android::hardware::drm::V1_2::IDrmPluginListener",
    "name" : "android::hardware::drm::V1_2::IDrmPluginListener",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/IDrmPluginListener.h",
    "unique_id" : "_ZTSN7android8hardware3drm4V1_218IDrmPluginListenerE",
@@ -29206,6 +29873,10 @@
      "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener20sendSessionLostStateERKNS0_8hidl_vecIhEE"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware3drm4V1_218IDrmPluginListener18sendKeysChange_1_2ERKNS0_8hidl_vecIhEERKNS4_INS2_9KeyStatusEEEb"
+    },
+    {
      "kind" : "vcall_offset"
     },
     {
@@ -29252,19 +29923,41 @@
    ]
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "keyId",
+     "referenced_type" : "type-103"
+    },
+    {
+     "field_name" : "type",
+     "field_offset" : 128,
+     "referenced_type" : "type-122"
+    }
+   ],
+   "linker_set_key" : "android::hardware::drm::V1_2::KeyStatus",
+   "name" : "android::hardware::drm::V1_2::KeyStatus",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/drm/1.2/android.hardware.drm@1.2_genc++_headers/gen/android/hardware/drm/1.2/types.h",
+   "unique_id" : "_ZTSN7android8hardware3drm4V1_29KeyStatusE"
+  },
+  {
    "alignment" : 1,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-887"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 16>",
    "name" : "android::hardware::hidl_array<unsigned char, 16>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-886",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -29277,13 +29970,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-903"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-902",
+   "self_type" : "type-902",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -29303,7 +29996,7 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-493"
+     "referenced_type" : "type-499"
     },
     {
      "access" : "private",
@@ -29320,8 +30013,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -29406,8 +30099,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -29489,19 +30182,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-161"
+     "referenced_type" : "type-166"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -29513,7 +30206,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-160"
+     "referenced_type" : "type-165"
     },
     {
      "access" : "private",
@@ -29530,8 +30223,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-871",
+   "self_type" : "type-871",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -29555,7 +30248,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
@@ -29573,7 +30266,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-885"
     },
     {
      "access" : "private",
@@ -29585,16 +30278,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-884",
+   "self_type" : "type-884",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-846" ],
+   "template_args" : [ "type-888" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -29604,7 +30297,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-468"
+     "referenced_type" : "type-483"
     },
     {
      "access" : "private",
@@ -29616,16 +30309,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyStatus>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-471" ],
+   "template_args" : [ "type-486" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09KeyStatusEEE"
   },
   {
@@ -29635,7 +30328,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-455"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
@@ -29647,16 +30340,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::KeyValue>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-458" ],
+   "template_args" : [ "type-477" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_08KeyValueEEE"
   },
   {
@@ -29666,7 +30359,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-491"
     },
     {
      "access" : "private",
@@ -29678,16 +30371,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SecureStop>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-478" ],
+   "template_args" : [ "type-494" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_010SecureStopEEE"
   },
   {
@@ -29697,7 +30390,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-182"
     },
     {
      "access" : "private",
@@ -29709,16 +30402,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_0::SubSample>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1249",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-180" ],
+   "template_args" : [ "type-185" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_09SubSampleEEE"
   },
   {
@@ -29740,7 +30433,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Attribute>",
@@ -29771,7 +30464,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Metric>",
@@ -29802,7 +30495,7 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup::Value>",
@@ -29821,7 +30514,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-365"
+     "referenced_type" : "type-375"
     },
     {
      "access" : "private",
@@ -29833,13 +30526,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
    "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_1::DrmMetricGroup>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-74" ],
@@ -29852,7 +30545,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-384"
     },
     {
      "access" : "private",
@@ -29864,16 +30557,47 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "name" : "android::hardware::hidl_vec<android::hardware::drm::V1_2::KeyStatus>",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-123" ],
+   "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_3drm4V1_29KeyStatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-899"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnsBuffer",
+     "field_offset" : 96,
+     "referenced_type" : "type-39"
     }
    ],
    "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-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-898",
+   "self_type" : "type-898",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-902" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -29883,7 +30607,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-890"
     },
     {
      "access" : "private",
@@ -29895,13 +30619,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-80" ],
@@ -29914,7 +30638,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-378"
     },
     {
      "access" : "private",
@@ -29926,16 +30650,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_vec<unsigned char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-103" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS1_IhEEEE"
   },
   {
@@ -29945,7 +30669,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-880"
+     "referenced_type" : "type-922"
     },
     {
      "access" : "private",
@@ -29957,16 +30681,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -29976,7 +30700,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-911"
     },
     {
      "access" : "private",
@@ -29988,16 +30712,16 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -30007,7 +30731,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30019,13 +30743,13 @@
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-90" ],
@@ -30038,19 +30762,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-890",
-   "self_type" : "type-890",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -30060,10 +30784,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -30072,13 +30796,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "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",
@@ -30200,10 +30924,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-927"
+     "referenced_type" : "type-969"
     },
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-151"
     }
    ],
    "fields" :
@@ -30212,19 +30936,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-1093"
+     "referenced_type" : "type-1144"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-1094"
+     "referenced_type" : "type-1145"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1143",
    "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",
@@ -30408,7 +31132,7 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "ptr",
@@ -30418,13 +31142,13 @@
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-948",
+   "self_type" : "type-948",
    "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"
@@ -30555,8 +31279,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "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",
@@ -30708,23 +31432,23 @@
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-910"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-949"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1096",
    "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"
@@ -30739,8 +31463,8 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "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",
@@ -30855,17 +31579,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-294"
+     "referenced_type" : "type-295"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-296" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -30875,17 +31599,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -30915,17 +31639,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-21"
+     "referenced_type" : "type-17"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-22" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -30935,17 +31659,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1167"
+     "referenced_type" : "type-1219"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -30955,17 +31679,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-25"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-40" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -30975,17 +31699,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-413" ],
+   "template_args" : [ "type-417" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_014ICryptoFactoryEEE"
   },
   {
@@ -30995,17 +31719,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-373"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-133" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_013ICryptoPluginEEE"
   },
   {
@@ -31015,17 +31739,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-231"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-190" ],
+   "template_args" : [ "type-195" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_011IDrmFactoryEEE"
   },
   {
@@ -31035,17 +31759,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-214"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-210" ],
+   "template_args" : [ "type-215" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_010IDrmPluginEEE"
   },
   {
@@ -31055,17 +31779,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-218"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-214" ],
+   "template_args" : [ "type-219" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_018IDrmPluginListenerEEE"
   },
   {
@@ -31075,17 +31799,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-438"
+     "referenced_type" : "type-443"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-442",
+   "self_type" : "type-442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-439" ],
+   "template_args" : [ "type-444" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_114ICryptoFactoryEEE"
   },
   {
@@ -31095,17 +31819,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-189" ],
+   "template_args" : [ "type-194" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_111IDrmFactoryEEE"
   },
   {
@@ -31115,17 +31839,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_1::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-385" ],
+   "template_args" : [ "type-410" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_110IDrmPluginEEE"
   },
   {
@@ -31135,17 +31859,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-460"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-462" ],
+   "template_args" : [ "type-461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_214ICryptoFactoryEEE"
   },
   {
@@ -31155,17 +31879,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1156"
+     "referenced_type" : "type-1207"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-132" ],
+   "template_args" : [ "type-139" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_213ICryptoPluginEEE"
   },
   {
@@ -31175,17 +31899,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory>",
    "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
+   "referenced_type" : "type-191",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-188" ],
+   "template_args" : [ "type-193" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_211IDrmFactoryEEE"
   },
   {
@@ -31195,17 +31919,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-383"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin>",
    "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-384" ],
+   "template_args" : [ "type-409" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_210IDrmPluginEEE"
   },
   {
@@ -31215,17 +31939,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-622"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-593" ],
+   "template_args" : [ "type-623" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware3drm4V1_218IDrmPluginListenerEEE"
   },
   {
@@ -31235,17 +31959,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-491"
+     "referenced_type" : "type-497"
     }
    ],
    "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-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-492" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -31255,17 +31979,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-905",
+   "self_type" : "type-905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -31281,8 +32005,8 @@
    "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-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-5" ],
@@ -31295,17 +32019,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-269"
     }
    ],
    "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-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-267" ],
+   "template_args" : [ "type-270" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -31315,47 +32039,47 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-336"
     }
    ],
    "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-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-354" ],
+   "template_args" : [ "type-337" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-691",
-   "self_type" : "type-691",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-800",
-   "self_type" : "type-800",
+   "referenced_type" : "type-842",
+   "self_type" : "type-842",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31365,63 +32089,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-794",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-767",
+   "self_type" : "type-767",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-774",
-   "self_type" : "type-774",
+   "referenced_type" : "type-783",
+   "self_type" : "type-783",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31431,8 +32155,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-774",
+   "self_type" : "type-774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31442,8 +32166,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-831",
+   "self_type" : "type-831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31453,63 +32177,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-759",
+   "self_type" : "type-759",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-691",
+   "self_type" : "type-691",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-840",
+   "self_type" : "type-840",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31519,63 +32243,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-791",
+   "referenced_type" : "type-833",
+   "self_type" : "type-833",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-761",
+   "self_type" : "type-761",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31585,8 +32309,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-772",
+   "self_type" : "type-772",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31596,8 +32320,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31607,33 +32331,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -31644,26 +32368,26 @@
    "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
+   "referenced_type" : "type-841",
+   "self_type" : "type-841",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31673,63 +32397,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-835",
+   "self_type" : "type-835",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-762",
+   "self_type" : "type-762",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-773",
-   "self_type" : "type-773",
+   "referenced_type" : "type-782",
+   "self_type" : "type-782",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-708",
+   "self_type" : "type-708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31739,8 +32463,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-773",
+   "self_type" : "type-773",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31750,8 +32474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31761,85 +32485,85 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "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-924",
-   "self_type" : "type-924",
+   "referenced_type" : "type-966",
+   "self_type" : "type-966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-58" ],
+   "template_args" : [ "type-44" ],
    "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-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-54" ],
    "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-693",
-   "self_type" : "type-693",
+   "referenced_type" : "type-690",
+   "self_type" : "type-690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
+   "template_args" : [ "type-57" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-91" ],
@@ -31849,63 +32573,63 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-834" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-768",
+   "self_type" : "type-768",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-786",
-   "self_type" : "type-786",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-46" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-772" ],
+   "template_args" : [ "type-779" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-713" ],
+   "template_args" : [ "type-730" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-724",
+   "self_type" : "type-724",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -31915,8 +32639,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -31926,8 +32650,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-790",
+   "referenced_type" : "type-832",
+   "self_type" : "type-832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-83" ],
@@ -31937,33 +32661,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-801" ],
    "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-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-760",
+   "self_type" : "type-760",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-393" ],
+   "template_args" : [ "type-396" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-43" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -31973,7 +32697,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-517"
     },
     {
      "access" : "private",
@@ -31985,11 +32709,11 @@
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-889",
-   "self_type" : "type-889",
+   "referenced_type" : "type-931",
+   "self_type" : "type-931",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-200" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -32011,8 +32735,8 @@
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-15" ],
@@ -32025,7 +32749,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-494"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
@@ -32037,11 +32761,11 @@
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-495" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -32076,18 +32800,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -32103,18 +32827,18 @@
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1009"
+     "referenced_type" : "type-1060"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1016"
+     "referenced_type" : "type-1068"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -32125,7 +32849,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1012"
+     "referenced_type" : "type-1064"
     },
     {
      "field_name" : "num_planes",
@@ -32135,13 +32859,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1014"
+     "referenced_type" : "type-1066"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -32152,48 +32876,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1010"
+     "referenced_type" : "type-1061"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -32204,38 +32928,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1017"
+     "referenced_type" : "type-1069"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1070",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -32246,18 +32970,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-834"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1069",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -32268,17 +32992,17 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-28"
     },
     {
      "field_name" : "ystride",
@@ -32298,13 +33022,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1009"
+     "referenced_type" : "type-1060"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32314,13 +33038,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -32331,35 +33055,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-394"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-392"
-    },
-    {
-     "field_name" : "entry_v3",
      "referenced_type" : "type-395"
     },
     {
+     "field_name" : "entry_v4",
+     "referenced_type" : "type-395"
+    },
+    {
+     "field_name" : "entry_v3",
+     "referenced_type" : "type-398"
+    },
+    {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-399"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-400"
     }
    ],
    "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-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "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)"
@@ -32380,8 +33104,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-956",
+   "self_type" : "type-956",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -32392,43 +33116,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -32439,32 +33163,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "euid",
@@ -32474,13 +33198,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -32491,32 +33215,32 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "lid",
@@ -32526,13 +33250,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -32543,17 +33267,17 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-396"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "tid",
@@ -32583,13 +33307,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -32600,28 +33324,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-27"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-166"
+     "referenced_type" : "type-171"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -32633,8 +33357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::drm::V1_0::Status> &&",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32642,8 +33366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoFactory> > &&",
-   "referenced_type" : "type-584",
-   "self_type" : "type-586",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32651,8 +33375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::ICryptoPlugin> > &&",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32660,8 +33384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmFactory> > &&",
-   "referenced_type" : "type-241",
-   "self_type" : "type-246",
+   "referenced_type" : "type-246",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32669,8 +33393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPlugin> > &&",
-   "referenced_type" : "type-430",
-   "self_type" : "type-433",
+   "referenced_type" : "type-447",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32678,8 +33402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::drm::V1_2::IDrmPluginListener> > &&",
-   "referenced_type" : "type-617",
-   "self_type" : "type-619",
+   "referenced_type" : "type-648",
+   "self_type" : "type-650",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32687,8 +33411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-561",
-   "self_type" : "type-579",
+   "referenced_type" : "type-552",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32696,8 +33420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-620",
-   "self_type" : "type-626",
+   "referenced_type" : "type-629",
+   "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32705,8 +33429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-243",
-   "self_type" : "type-540",
+   "referenced_type" : "type-248",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32714,8 +33438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-242",
-   "self_type" : "type-608",
+   "referenced_type" : "type-247",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32723,8 +33447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-160",
-   "self_type" : "type-831",
+   "referenced_type" : "type-165",
+   "self_type" : "type-873",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32732,8 +33456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-829",
-   "self_type" : "type-835",
+   "referenced_type" : "type-871",
+   "self_type" : "type-877",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32741,8 +33465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::ICryptoPlugin> &&",
-   "referenced_type" : "type-375",
-   "self_type" : "type-387",
+   "referenced_type" : "type-372",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32750,8 +33474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPlugin> &&",
-   "referenced_type" : "type-208",
-   "self_type" : "type-221",
+   "referenced_type" : "type-213",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32759,8 +33483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_0::IDrmPluginListener> &&",
-   "referenced_type" : "type-212",
-   "self_type" : "type-415",
+   "referenced_type" : "type-217",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32768,8 +33492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoFactory> &&",
-   "referenced_type" : "type-460",
-   "self_type" : "type-473",
+   "referenced_type" : "type-459",
+   "self_type" : "type-463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32777,8 +33501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::ICryptoPlugin> &&",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32786,8 +33510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmFactory> &&",
-   "referenced_type" : "type-186",
-   "self_type" : "type-238",
+   "referenced_type" : "type-191",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32795,8 +33519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPlugin> &&",
-   "referenced_type" : "type-382",
-   "self_type" : "type-425",
+   "referenced_type" : "type-407",
+   "self_type" : "type-440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32804,8 +33528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
    "name" : "android::sp<android::hardware::drm::V1_2::IDrmPluginListener> &&",
-   "referenced_type" : "type-591",
-   "self_type" : "type-612",
+   "referenced_type" : "type-621",
+   "self_type" : "type-645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32813,8 +33537,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-490",
-   "self_type" : "type-496",
+   "referenced_type" : "type-496",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32822,8 +33546,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-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32831,8 +33555,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-280",
-   "self_type" : "type-279",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32840,8 +33564,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-512",
-   "self_type" : "type-511",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32849,8 +33573,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-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-532",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32858,8 +33582,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-978",
-   "self_type" : "type-977",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32867,8 +33591,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1030",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32876,8 +33600,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-285",
-   "self_type" : "type-284",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32885,8 +33609,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-516",
-   "self_type" : "type-515",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32894,8 +33618,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
+   "referenced_type" : "type-536",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32903,8 +33627,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-989",
-   "self_type" : "type-988",
+   "referenced_type" : "type-697",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32912,8 +33636,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32921,8 +33645,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-282",
-   "self_type" : "type-281",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32930,8 +33654,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32939,8 +33663,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -32948,8 +33672,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-980",
-   "self_type" : "type-979",
+   "referenced_type" : "type-695",
+   "self_type" : "type-694",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }